Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CL 1.1.8: Rename fork merge to bellatrix #3607

Merged
merged 6 commits into from
Jan 14, 2022
Merged

Conversation

g11tech
Copy link
Contributor

@g11tech g11tech commented Jan 12, 2022

Motivation
As per specs CL 1.1.8, fork merge is being renamed to bellatrix as merge will be more specifically used for the event of merge of EL into PoS.
FYI Empty place holder files are for bellatrix/transition and bellatrix/fork scenarios planned to be added as a separate PR, tracked here: #3541

This PR renames the relevant fields, files, types from fork merge to bellatrix

Closes #3575

@codeclimate
Copy link

codeclimate bot commented Jan 12, 2022

Code Climate has analyzed commit 4924b4f and detected 1 issue on this pull request.

Here's the issue category breakdown:

Category Count
Complexity 1

View more on Code Climate.

@g11tech g11tech marked this pull request as draft January 12, 2022 11:10
@codecov
Copy link

codecov bot commented Jan 12, 2022

Codecov Report

Merging #3607 (4924b4f) into master (b4facd3) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3607   +/-   ##
=======================================
  Coverage   37.45%   37.45%           
=======================================
  Files         311      311           
  Lines        8364     8364           
  Branches     1297     1297           
=======================================
  Hits         3133     3133           
  Misses       5082     5082           
  Partials      149      149           

@github-actions
Copy link
Contributor

github-actions bot commented Jan 12, 2022

Performance Report

✔️ no performance regression detected

Full benchmark results
Benchmark suite Current: 90987e8 Previous: b4facd3 Ratio
BeaconState.hashTreeRoot - No change 597.00 ns/op 557.00 ns/op 1.07
BeaconState.hashTreeRoot - 1 full validator 139.98 us/op 125.77 us/op 1.11
BeaconState.hashTreeRoot - 32 full validator 1.9686 ms/op 1.9701 ms/op 1.00
BeaconState.hashTreeRoot - 512 full validator 28.775 ms/op 25.791 ms/op 1.12
BeaconState.hashTreeRoot - 1 validator.effectiveBalance 144.38 us/op 126.59 us/op 1.14
BeaconState.hashTreeRoot - 32 validator.effectiveBalance 2.5040 ms/op 2.1257 ms/op 1.18
BeaconState.hashTreeRoot - 512 validator.effectiveBalance 33.841 ms/op 28.484 ms/op 1.19
BeaconState.hashTreeRoot - 1 balances 106.54 us/op 87.436 us/op 1.22
BeaconState.hashTreeRoot - 32 balances 845.35 us/op 778.64 us/op 1.09
BeaconState.hashTreeRoot - 512 balances 7.8882 ms/op 7.4249 ms/op 1.06
BeaconState.hashTreeRoot - 250000 balances 166.42 ms/op 137.59 ms/op 1.21
processSlot - 1 slots 57.831 us/op 49.145 us/op 1.18
processSlot - 32 slots 3.3181 ms/op 2.9524 ms/op 1.12
getCommitteeAssignments - req 1 vs - 250000 vc 5.8848 ms/op 5.3174 ms/op 1.11
getCommitteeAssignments - req 100 vs - 250000 vc 8.3239 ms/op 8.6738 ms/op 0.96
getCommitteeAssignments - req 1000 vs - 250000 vc 8.4758 ms/op 8.2607 ms/op 1.03
computeProposers - vc 250000 22.264 ms/op 20.863 ms/op 1.07
computeEpochShuffling - vc 250000 201.81 ms/op 183.00 ms/op 1.10
getNextSyncCommittee - vc 250000 417.70 ms/op 337.34 ms/op 1.24
altair processAttestation - 250000 vs - 7PWei normalcase 50.062 ms/op 43.123 ms/op 1.16
altair processAttestation - 250000 vs - 7PWei worstcase 54.059 ms/op 45.693 ms/op 1.18
altair processAttestation - setStatus - 1/6 committees join 12.595 ms/op 10.729 ms/op 1.17
altair processAttestation - setStatus - 1/3 committees join 29.314 ms/op 23.319 ms/op 1.26
altair processAttestation - setStatus - 1/2 committees join 39.565 ms/op 35.756 ms/op 1.11
altair processAttestation - setStatus - 2/3 committees join 49.077 ms/op 49.560 ms/op 0.99
altair processAttestation - setStatus - 4/5 committees join 55.075 ms/op 57.622 ms/op 0.96
altair processAttestation - setStatus - 100% committees join 67.462 ms/op 74.581 ms/op 0.90
altair processAttestation - updateEpochParticipants - 1/6 committees join 11.777 ms/op 11.964 ms/op 0.98
altair processAttestation - updateEpochParticipants - 1/3 committees join 26.270 ms/op 25.832 ms/op 1.02
altair processAttestation - updateEpochParticipants - 1/2 committees join 27.912 ms/op 32.566 ms/op 0.86
altair processAttestation - updateEpochParticipants - 2/3 committees join 37.452 ms/op 28.553 ms/op 1.31
altair processAttestation - updateEpochParticipants - 4/5 committees join 31.200 ms/op 29.554 ms/op 1.06
altair processAttestation - updateEpochParticipants - 100% committees join 33.110 ms/op 30.938 ms/op 1.07
altair processAttestation - updateAllStatus 22.867 ms/op 26.438 ms/op 0.86
altair processBlock - 250000 vs - 7PWei normalcase 59.610 ms/op 45.424 ms/op 1.31
altair processBlock - 250000 vs - 7PWei worstcase 127.00 ms/op 118.58 ms/op 1.07
altair processEpoch - mainnet_e81889 1.1305 s/op 1.0277 s/op 1.10
mainnet_e81889 - altair beforeProcessEpoch 383.90 ms/op 278.17 ms/op 1.38
mainnet_e81889 - altair processJustificationAndFinalization 75.464 us/op 65.502 us/op 1.15
mainnet_e81889 - altair processInactivityUpdates 20.994 ms/op 18.409 ms/op 1.14
mainnet_e81889 - altair processRewardsAndPenalties 173.05 ms/op 146.55 ms/op 1.18
mainnet_e81889 - altair processRegistryUpdates 12.239 us/op 8.0910 us/op 1.51
mainnet_e81889 - altair processSlashings 3.4860 us/op 1.6540 us/op 2.11
mainnet_e81889 - altair processEth1DataReset 3.3200 us/op 1.4130 us/op 2.35
mainnet_e81889 - altair processEffectiveBalanceUpdates 15.958 ms/op 11.413 ms/op 1.40
mainnet_e81889 - altair processSlashingsReset 18.973 us/op 11.173 us/op 1.70
mainnet_e81889 - altair processRandaoMixesReset 22.436 us/op 15.119 us/op 1.48
mainnet_e81889 - altair processHistoricalRootsUpdate 4.2460 us/op 1.6260 us/op 2.61
mainnet_e81889 - altair processParticipationFlagUpdates 123.80 ms/op 162.28 ms/op 0.76
mainnet_e81889 - altair processSyncCommitteeUpdates 3.0930 us/op 1.2370 us/op 2.50
mainnet_e81889 - altair afterProcessEpoch 276.04 ms/op 221.03 ms/op 1.25
altair processInactivityUpdates - 250000 normalcase 82.759 ms/op 70.460 ms/op 1.17
altair processInactivityUpdates - 250000 worstcase 84.575 ms/op 70.770 ms/op 1.20
altair processParticipationFlagUpdates - 250000 anycase 134.82 ms/op 93.436 ms/op 1.44
altair processRewardsAndPenalties - 250000 normalcase 176.00 ms/op 132.68 ms/op 1.33
altair processRewardsAndPenalties - 250000 worstcase 175.21 ms/op 148.16 ms/op 1.18
altair processSyncCommitteeUpdates - 250000 421.51 ms/op 364.29 ms/op 1.16
Tree 40 250000 create 1.0350 s/op 864.12 ms/op 1.20
Tree 40 250000 get(125000) 384.98 ns/op 324.71 ns/op 1.19
Tree 40 250000 set(125000) 2.4903 us/op 1.9418 us/op 1.28
Tree 40 250000 toArray() 44.666 ms/op 45.879 ms/op 0.97
Tree 40 250000 iterate all - toArray() + loop 48.256 ms/op 39.413 ms/op 1.22
Tree 40 250000 iterate all - get(i) 129.59 ms/op 120.24 ms/op 1.08
MutableVector 250000 create 30.608 ms/op 25.455 ms/op 1.20
MutableVector 250000 get(125000) 17.597 ns/op 14.274 ns/op 1.23
MutableVector 250000 set(125000) 737.03 ns/op 558.96 ns/op 1.32
MutableVector 250000 toArray() 10.804 ms/op 8.7278 ms/op 1.24
MutableVector 250000 iterate all - toArray() + loop 9.6031 ms/op 8.9155 ms/op 1.08
MutableVector 250000 iterate all - get(i) 3.9565 ms/op 3.1330 ms/op 1.26
Array 250000 create 5.9920 ms/op 5.5767 ms/op 1.07
Array 250000 clone - spread 2.3429 ms/op 2.3566 ms/op 0.99
Array 250000 get(125000) 1.1080 ns/op 1.0700 ns/op 1.04
Array 250000 set(125000) 1.0760 ns/op 1.0560 ns/op 1.02
Array 250000 iterate all - loop 173.17 us/op 167.89 us/op 1.03
aggregationBits - 2048 els - readonlyValues 251.15 us/op 242.54 us/op 1.04
aggregationBits - 2048 els - zipIndexesInBitList 50.613 us/op 43.137 us/op 1.17
regular array get 100000 times 75.492 us/op 67.402 us/op 1.12
wrappedArray get 100000 times 76.085 us/op 67.400 us/op 1.13
arrayWithProxy get 100000 times 33.758 ms/op 28.377 ms/op 1.19
ssz.Root.equals 1.5710 us/op 1.1730 us/op 1.34
ssz.Root.equals with valueOf() 2.1390 us/op 1.3830 us/op 1.55
byteArrayEquals with valueOf() 2.1340 us/op 1.3540 us/op 1.58
phase0 processBlock - 250000 vs - 7PWei normalcase 13.577 ms/op 10.697 ms/op 1.27
phase0 processBlock - 250000 vs - 7PWei worstcase 95.114 ms/op 77.782 ms/op 1.22
phase0 afterProcessEpoch - 250000 vs - 7PWei 221.34 ms/op 206.89 ms/op 1.07
phase0 beforeProcessEpoch - 250000 vs - 7PWei 663.80 ms/op 592.18 ms/op 1.12
phase0 processEpoch - mainnet_e58758 1.0126 s/op 794.70 ms/op 1.27
mainnet_e58758 - phase0 beforeProcessEpoch 504.86 ms/op 433.99 ms/op 1.16
mainnet_e58758 - phase0 processJustificationAndFinalization 57.971 us/op 90.903 us/op 0.64
mainnet_e58758 - phase0 processRewardsAndPenalties 138.04 ms/op 98.537 ms/op 1.40
mainnet_e58758 - phase0 processRegistryUpdates 49.574 us/op 46.659 us/op 1.06
mainnet_e58758 - phase0 processSlashings 3.5350 us/op 1.9240 us/op 1.84
mainnet_e58758 - phase0 processEth1DataReset 3.3200 us/op 1.4600 us/op 2.27
mainnet_e58758 - phase0 processEffectiveBalanceUpdates 11.476 ms/op 9.3479 ms/op 1.23
mainnet_e58758 - phase0 processSlashingsReset 16.047 us/op 10.246 us/op 1.57
mainnet_e58758 - phase0 processRandaoMixesReset 22.944 us/op 15.484 us/op 1.48
mainnet_e58758 - phase0 processHistoricalRootsUpdate 3.5090 us/op 1.4690 us/op 2.39
mainnet_e58758 - phase0 processParticipationRecordUpdates 14.931 us/op 11.604 us/op 1.29
mainnet_e58758 - phase0 afterProcessEpoch 216.91 ms/op 181.16 ms/op 1.20
phase0 processEffectiveBalanceUpdates - 250000 normalcase 13.114 ms/op 10.773 ms/op 1.22
phase0 processEffectiveBalanceUpdates - 250000 worstcase 0.5 1.4296 s/op 1.3572 s/op 1.05
phase0 processRegistryUpdates - 250000 normalcase 55.692 us/op 49.028 us/op 1.14
phase0 processRegistryUpdates - 250000 badcase_full_deposits 2.9672 ms/op 3.0835 ms/op 0.96
phase0 processRegistryUpdates - 250000 worstcase 0.5 2.0186 s/op 1.7511 s/op 1.15
phase0 getAttestationDeltas - 250000 normalcase 40.175 ms/op 34.868 ms/op 1.15
phase0 getAttestationDeltas - 250000 worstcase 42.556 ms/op 34.940 ms/op 1.22
phase0 processSlashings - 250000 worstcase 46.510 ms/op 50.649 ms/op 0.92
shuffle list - 16384 els 15.184 ms/op 12.568 ms/op 1.21
shuffle list - 250000 els 204.55 ms/op 181.55 ms/op 1.13
getEffectiveBalances - 250000 vs - 7PWei 13.114 ms/op 10.063 ms/op 1.30
pass gossip attestations to forkchoice per slot 17.457 ms/op 19.759 ms/op 0.88
computeDeltas 3.5634 ms/op 3.8634 ms/op 0.92
getPubkeys - index2pubkey - req 1000 vs - 250000 vc 2.6207 ms/op 2.4009 ms/op 1.09
getPubkeys - validatorsArr - req 1000 vs - 250000 vc 823.63 us/op 686.51 us/op 1.20
BLS verify - blst-native 2.2355 ms/op 1.8583 ms/op 1.20
BLS verifyMultipleSignatures 3 - blst-native 4.5811 ms/op 3.8152 ms/op 1.20
BLS verifyMultipleSignatures 8 - blst-native 8.9226 ms/op 8.2312 ms/op 1.08
BLS verifyMultipleSignatures 32 - blst-native 32.935 ms/op 29.896 ms/op 1.10
BLS aggregatePubkeys 32 - blst-native 43.457 us/op 39.852 us/op 1.09
BLS aggregatePubkeys 128 - blst-native 171.15 us/op 153.66 us/op 1.11
getAttestationsForBlock 102.39 ms/op 81.487 ms/op 1.26
CheckpointStateCache - add get delete 22.772 us/op 19.566 us/op 1.16
validate gossip signedAggregateAndProof - struct 5.2759 ms/op 4.4610 ms/op 1.18
validate gossip signedAggregateAndProof - treeBacked 4.7982 ms/op 4.3983 ms/op 1.09
validate gossip attestation - struct 2.2191 ms/op 2.0925 ms/op 1.06
validate gossip attestation - treeBacked 2.4167 ms/op 2.1179 ms/op 1.14
bytes32 toHexString 1.7790 us/op 1.7190 us/op 1.03
bytes32 Buffer.toString(hex) 793.00 ns/op 698.00 ns/op 1.14
bytes32 Buffer.toString(hex) from Uint8Array 1.0270 us/op 971.00 ns/op 1.06
bytes32 Buffer.toString(hex) + 0x 808.00 ns/op 689.00 ns/op 1.17
Object access 1 prop 0.39400 ns/op 0.32900 ns/op 1.20
Map access 1 prop 0.33200 ns/op 0.29100 ns/op 1.14
Object get x1000 20.737 ns/op 19.039 ns/op 1.09
Map get x1000 1.1670 ns/op 0.95400 ns/op 1.22
Object set x1000 132.28 ns/op 112.37 ns/op 1.18
Map set x1000 78.696 ns/op 66.102 ns/op 1.19
Return object 10000 times 0.44100 ns/op 0.37470 ns/op 1.18
Throw Error 10000 times 6.9988 us/op 5.8268 us/op 1.20
enrSubnets - fastDeserialize 64 bits 1.5240 us/op 1.3380 us/op 1.14
enrSubnets - ssz BitVector 64 bits 20.239 us/op 16.806 us/op 1.20
enrSubnets - fastDeserialize 4 bits 538.00 ns/op 470.00 ns/op 1.14
enrSubnets - ssz BitVector 4 bits 3.4620 us/op 2.9510 us/op 1.17
RateTracker 1000000 limit, 1 obj count per request 216.92 ns/op 180.38 ns/op 1.20
RateTracker 1000000 limit, 2 obj count per request 163.18 ns/op 134.61 ns/op 1.21
RateTracker 1000000 limit, 4 obj count per request 135.48 ns/op 109.69 ns/op 1.24
RateTracker 1000000 limit, 8 obj count per request 121.93 ns/op 99.088 ns/op 1.23
RateTracker with prune 5.0010 us/op 3.8590 us/op 1.30

by benchmarkbot/action

@g11tech g11tech marked this pull request as ready for review January 14, 2022 12:48
Copy link
Contributor

@dapplion dapplion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's go! Bellatrix ⭐

@wemeetagain wemeetagain merged commit 1180ca7 into master Jan 14, 2022
@wemeetagain wemeetagain deleted the g11tech/bellatrix branch January 14, 2022 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CL spec: 1.1.8 - rename Merge -> Bellatrix
3 participants