status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove vestigial/unused BLSToExecutionChange parameters (#4535)

This commit is contained in:
tersec 2023-01-20 20:51:54 +00:00 committed by GitHub
parent aacc8d702d
commit 6a64048e80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
beacon_chain/spec/state_transition.nim
View File

@ -497,7 +497,6 @@ proc makeBeaconBlock*[T: bellatrix.ExecutionPayload | capella.ExecutionPayload](
validator_changes: BeaconBlockValidatorChanges,
sync_aggregate: SyncAggregate,
executionPayload: T,
bls_to_execution_changes: SignedBLSToExecutionChangeList,
rollback: RollbackForkedHashedProc,
cache: var StateCache,
# TODO:
@ -587,16 +586,14 @@ proc makeBeaconBlock*[T](
proposer_index: ValidatorIndex, randao_reveal: ValidatorSig,
eth1_data: Eth1Data, graffiti: GraffitiBytes,
attestations: seq[Attestation], deposits: seq[Deposit],
exits: BeaconBlockValidatorChanges, sync_aggregate: SyncAggregate,
executionPayload: T,
bls_to_execution_changes: SignedBLSToExecutionChangeList, # TODO remove
validator_changes: BeaconBlockValidatorChanges,
sync_aggregate: SyncAggregate, executionPayload: T,
rollback: RollbackForkedHashedProc, cache: var StateCache):
Result[ForkedBeaconBlock, cstring] =
makeBeaconBlock(
cfg, state, proposer_index, randao_reveal, eth1_data, graffiti,
attestations, deposits, exits, sync_aggregate, executionPayload,
bls_to_execution_changes, rollback, cache,
verificationFlags = {},
attestations, deposits, validator_changes, sync_aggregate,
executionPayload, rollback, cache, verificationFlags = {},
transactions_root = Opt.none Eth2Digest,
execution_payload_root = Opt.none Eth2Digest)
@ -605,16 +602,14 @@ proc makeBeaconBlock*[T](
proposer_index: ValidatorIndex, randao_reveal: ValidatorSig,
eth1_data: Eth1Data, graffiti: GraffitiBytes,
attestations: seq[Attestation], deposits: seq[Deposit],
exits: BeaconBlockValidatorChanges, sync_aggregate: SyncAggregate,
executionPayload: T,
bls_to_execution_changes: SignedBLSToExecutionChangeList, # TODO remove
validator_changes: BeaconBlockValidatorChanges,
sync_aggregate: SyncAggregate, executionPayload: T,
rollback: RollbackForkedHashedProc,
cache: var StateCache, verificationFlags: UpdateFlags):
Result[ForkedBeaconBlock, cstring] =
makeBeaconBlock(
cfg, state, proposer_index, randao_reveal, eth1_data, graffiti,
attestations, deposits, exits, sync_aggregate, executionPayload,
bls_to_execution_changes, rollback, cache,
verificationFlags = verificationFlags,
attestations, deposits, validator_changes, sync_aggregate,
executionPayload, rollback, cache, verificationFlags = verificationFlags,
transactions_root = Opt.none Eth2Digest,
execution_payload_root = Opt.none Eth2Digest)

1
beacon_chain/validators/validator_duties.nim
View File

@ -515,7 +515,6 @@ proc makeBeaconBlockForHeadAndSlot*[EP](
exits,
syncAggregate,
payload,
(static(default(SignedBLSToExecutionChangeList))), # TODO remove
noRollback, # Temporary state - no need for rollback
cache,
verificationFlags = {},

1
research/wss_sim.nim
View File

@ -163,7 +163,6 @@ cli do(validatorsDir: string, secretsDir: string,
BeaconBlockValidatorChanges(),
syncAggregate,
default(bellatrix.ExecutionPayload),
(static(default(SignedBLSToExecutionChangeList))),
noRollback,
cache).get()

1
tests/testblockutil.nim
View File

@ -202,7 +202,6 @@ proc addTestBlockAux[EP: bellatrix.ExecutionPayload | capella.ExecutionPayload](
BeaconBlockValidatorChanges(),
sync_aggregate,
execution_payload,
default(SignedBLSToExecutionChangeList),
noRollback,
cache,
verificationFlags = {skipBlsValidation})