@lodestar/state-transition 1.40.0-dev.3be9500fa9 → 1.40.0-dev.45b04262dc

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (183) hide show
  1. package/lib/block/index.d.ts +1 -0
  2. package/lib/block/index.d.ts.map +1 -1
  3. package/lib/block/index.js +1 -0
  4. package/lib/block/index.js.map +1 -1
  5. package/lib/block/isValidIndexedAttestation.d.ts.map +1 -1
  6. package/lib/block/isValidIndexedAttestation.js +2 -2
  7. package/lib/block/isValidIndexedAttestation.js.map +1 -1
  8. package/lib/block/isValidIndexedPayloadAttestation.d.ts.map +1 -1
  9. package/lib/block/isValidIndexedPayloadAttestation.js +1 -1
  10. package/lib/block/isValidIndexedPayloadAttestation.js.map +1 -1
  11. package/lib/block/processAttestationsAltair.d.ts.map +1 -1
  12. package/lib/block/processAttestationsAltair.js +3 -4
  13. package/lib/block/processAttestationsAltair.js.map +1 -1
  14. package/lib/block/processBlockHeader.d.ts.map +1 -1
  15. package/lib/block/processBlockHeader.js +1 -2
  16. package/lib/block/processBlockHeader.js.map +1 -1
  17. package/lib/block/processBlsToExecutionChange.d.ts.map +1 -1
  18. package/lib/block/processBlsToExecutionChange.js +1 -2
  19. package/lib/block/processBlsToExecutionChange.js.map +1 -1
  20. package/lib/block/processConsolidationRequest.d.ts +1 -2
  21. package/lib/block/processConsolidationRequest.d.ts.map +1 -1
  22. package/lib/block/processConsolidationRequest.js +5 -4
  23. package/lib/block/processConsolidationRequest.js.map +1 -1
  24. package/lib/block/processDepositRequest.d.ts +8 -2
  25. package/lib/block/processDepositRequest.d.ts.map +1 -1
  26. package/lib/block/processDepositRequest.js +81 -8
  27. package/lib/block/processDepositRequest.js.map +1 -1
  28. package/lib/block/processExecutionPayload.d.ts.map +1 -1
  29. package/lib/block/processExecutionPayload.js +1 -2
  30. package/lib/block/processExecutionPayload.js.map +1 -1
  31. package/lib/block/processExecutionPayloadBid.d.ts.map +1 -1
  32. package/lib/block/processExecutionPayloadBid.js +17 -31
  33. package/lib/block/processExecutionPayloadBid.js.map +1 -1
  34. package/lib/block/processExecutionPayloadEnvelope.d.ts.map +1 -1
  35. package/lib/block/processExecutionPayloadEnvelope.js +27 -27
  36. package/lib/block/processExecutionPayloadEnvelope.js.map +1 -1
  37. package/lib/block/processOperations.js +2 -2
  38. package/lib/block/processOperations.js.map +1 -1
  39. package/lib/block/processPayloadAttestation.d.ts.map +1 -1
  40. package/lib/block/processPayloadAttestation.js +1 -1
  41. package/lib/block/processPayloadAttestation.js.map +1 -1
  42. package/lib/block/processProposerSlashing.js +2 -2
  43. package/lib/block/processProposerSlashing.js.map +1 -1
  44. package/lib/block/processSyncCommittee.d.ts +1 -2
  45. package/lib/block/processSyncCommittee.d.ts.map +1 -1
  46. package/lib/block/processSyncCommittee.js +6 -6
  47. package/lib/block/processSyncCommittee.js.map +1 -1
  48. package/lib/block/processVoluntaryExit.d.ts +1 -1
  49. package/lib/block/processVoluntaryExit.d.ts.map +1 -1
  50. package/lib/block/processVoluntaryExit.js +45 -3
  51. package/lib/block/processVoluntaryExit.js.map +1 -1
  52. package/lib/block/processWithdrawalRequest.js +1 -1
  53. package/lib/block/processWithdrawalRequest.js.map +1 -1
  54. package/lib/block/processWithdrawals.d.ts +1 -0
  55. package/lib/block/processWithdrawals.d.ts.map +1 -1
  56. package/lib/block/processWithdrawals.js +122 -68
  57. package/lib/block/processWithdrawals.js.map +1 -1
  58. package/lib/epoch/processBuilderPendingPayments.d.ts.map +1 -1
  59. package/lib/epoch/processBuilderPendingPayments.js +1 -4
  60. package/lib/epoch/processBuilderPendingPayments.js.map +1 -1
  61. package/lib/epoch/processPendingAttestations.d.ts.map +1 -1
  62. package/lib/epoch/processPendingAttestations.js +1 -1
  63. package/lib/epoch/processPendingAttestations.js.map +1 -1
  64. package/lib/signatureSets/attesterSlashings.d.ts +3 -4
  65. package/lib/signatureSets/attesterSlashings.d.ts.map +1 -1
  66. package/lib/signatureSets/attesterSlashings.js +6 -6
  67. package/lib/signatureSets/attesterSlashings.js.map +1 -1
  68. package/lib/signatureSets/blsToExecutionChange.d.ts +3 -3
  69. package/lib/signatureSets/blsToExecutionChange.d.ts.map +1 -1
  70. package/lib/signatureSets/blsToExecutionChange.js.map +1 -1
  71. package/lib/signatureSets/executionPayloadBid.d.ts +4 -0
  72. package/lib/signatureSets/executionPayloadBid.d.ts.map +1 -0
  73. package/lib/signatureSets/executionPayloadBid.js +8 -0
  74. package/lib/signatureSets/executionPayloadBid.js.map +1 -0
  75. package/lib/signatureSets/executionPayloadEnvelope.d.ts +4 -0
  76. package/lib/signatureSets/executionPayloadEnvelope.d.ts.map +1 -0
  77. package/lib/signatureSets/executionPayloadEnvelope.js +8 -0
  78. package/lib/signatureSets/executionPayloadEnvelope.js.map +1 -0
  79. package/lib/signatureSets/index.d.ts +3 -2
  80. package/lib/signatureSets/index.d.ts.map +1 -1
  81. package/lib/signatureSets/index.js +10 -8
  82. package/lib/signatureSets/index.js.map +1 -1
  83. package/lib/signatureSets/indexedAttestation.d.ts +3 -4
  84. package/lib/signatureSets/indexedAttestation.d.ts.map +1 -1
  85. package/lib/signatureSets/indexedAttestation.js +6 -6
  86. package/lib/signatureSets/indexedAttestation.js.map +1 -1
  87. package/lib/signatureSets/indexedPayloadAttestation.d.ts +5 -4
  88. package/lib/signatureSets/indexedPayloadAttestation.d.ts.map +1 -1
  89. package/lib/signatureSets/indexedPayloadAttestation.js +3 -3
  90. package/lib/signatureSets/indexedPayloadAttestation.js.map +1 -1
  91. package/lib/signatureSets/proposer.d.ts +3 -3
  92. package/lib/signatureSets/proposer.d.ts.map +1 -1
  93. package/lib/signatureSets/proposer.js +12 -12
  94. package/lib/signatureSets/proposer.js.map +1 -1
  95. package/lib/signatureSets/proposerSlashings.d.ts +2 -3
  96. package/lib/signatureSets/proposerSlashings.d.ts.map +1 -1
  97. package/lib/signatureSets/proposerSlashings.js +6 -6
  98. package/lib/signatureSets/proposerSlashings.js.map +1 -1
  99. package/lib/signatureSets/randao.d.ts +1 -1
  100. package/lib/signatureSets/randao.d.ts.map +1 -1
  101. package/lib/signatureSets/randao.js +4 -4
  102. package/lib/signatureSets/randao.js.map +1 -1
  103. package/lib/signatureSets/voluntaryExits.d.ts +2 -2
  104. package/lib/signatureSets/voluntaryExits.d.ts.map +1 -1
  105. package/lib/signatureSets/voluntaryExits.js +6 -6
  106. package/lib/signatureSets/voluntaryExits.js.map +1 -1
  107. package/lib/slot/index.d.ts.map +1 -1
  108. package/lib/slot/index.js +1 -1
  109. package/lib/slot/index.js.map +1 -1
  110. package/lib/util/electra.d.ts.map +1 -1
  111. package/lib/util/electra.js +1 -2
  112. package/lib/util/electra.js.map +1 -1
  113. package/lib/util/gloas.d.ts +46 -5
  114. package/lib/util/gloas.d.ts.map +1 -1
  115. package/lib/util/gloas.js +92 -6
  116. package/lib/util/gloas.js.map +1 -1
  117. package/lib/util/index.d.ts +1 -0
  118. package/lib/util/index.d.ts.map +1 -1
  119. package/lib/util/index.js +1 -0
  120. package/lib/util/index.js.map +1 -1
  121. package/lib/util/interop.js +1 -1
  122. package/lib/util/interop.js.map +1 -1
  123. package/lib/util/loadState/findModifiedInactivityScores.d.ts +1 -1
  124. package/lib/util/loadState/findModifiedInactivityScores.d.ts.map +1 -1
  125. package/lib/util/loadState/findModifiedInactivityScores.js +3 -2
  126. package/lib/util/loadState/findModifiedInactivityScores.js.map +1 -1
  127. package/lib/util/loadState/findModifiedValidators.d.ts +2 -2
  128. package/lib/util/loadState/findModifiedValidators.d.ts.map +1 -1
  129. package/lib/util/loadState/findModifiedValidators.js +4 -3
  130. package/lib/util/loadState/findModifiedValidators.js.map +1 -1
  131. package/lib/util/loadState/loadValidator.d.ts.map +1 -1
  132. package/lib/util/loadState/loadValidator.js +3 -2
  133. package/lib/util/loadState/loadValidator.js.map +1 -1
  134. package/lib/util/signatureSets.d.ts +38 -5
  135. package/lib/util/signatureSets.d.ts.map +1 -1
  136. package/lib/util/signatureSets.js +48 -6
  137. package/lib/util/signatureSets.js.map +1 -1
  138. package/lib/util/validator.d.ts +6 -1
  139. package/lib/util/validator.d.ts.map +1 -1
  140. package/lib/util/validator.js +26 -16
  141. package/lib/util/validator.js.map +1 -1
  142. package/package.json +8 -8
  143. package/src/block/index.ts +1 -0
  144. package/src/block/isValidIndexedAttestation.ts +3 -2
  145. package/src/block/isValidIndexedPayloadAttestation.ts +4 -1
  146. package/src/block/processAttestationsAltair.ts +3 -10
  147. package/src/block/processBlockHeader.ts +1 -2
  148. package/src/block/processBlsToExecutionChange.ts +1 -2
  149. package/src/block/processConsolidationRequest.ts +5 -5
  150. package/src/block/processDepositRequest.ts +101 -8
  151. package/src/block/processExecutionPayload.ts +1 -2
  152. package/src/block/processExecutionPayloadBid.ts +21 -44
  153. package/src/block/processExecutionPayloadEnvelope.ts +35 -32
  154. package/src/block/processOperations.ts +2 -2
  155. package/src/block/processPayloadAttestation.ts +1 -1
  156. package/src/block/processProposerSlashing.ts +2 -2
  157. package/src/block/processSyncCommittee.ts +4 -7
  158. package/src/block/processVoluntaryExit.ts +60 -5
  159. package/src/block/processWithdrawalRequest.ts +1 -1
  160. package/src/block/processWithdrawals.ts +169 -72
  161. package/src/epoch/processBuilderPendingPayments.ts +1 -5
  162. package/src/epoch/processPendingAttestations.ts +1 -1
  163. package/src/signatureSets/attesterSlashings.ts +3 -7
  164. package/src/signatureSets/blsToExecutionChange.ts +3 -3
  165. package/src/signatureSets/executionPayloadBid.ts +14 -0
  166. package/src/signatureSets/executionPayloadEnvelope.ts +13 -0
  167. package/src/signatureSets/index.ts +8 -9
  168. package/src/signatureSets/indexedAttestation.ts +2 -7
  169. package/src/signatureSets/indexedPayloadAttestation.ts +9 -7
  170. package/src/signatureSets/proposer.ts +8 -12
  171. package/src/signatureSets/proposerSlashings.ts +4 -7
  172. package/src/signatureSets/randao.ts +4 -8
  173. package/src/signatureSets/voluntaryExits.ts +5 -10
  174. package/src/slot/index.ts +1 -1
  175. package/src/util/electra.ts +1 -4
  176. package/src/util/gloas.ts +117 -11
  177. package/src/util/index.ts +1 -0
  178. package/src/util/interop.ts +1 -1
  179. package/src/util/loadState/findModifiedInactivityScores.ts +4 -2
  180. package/src/util/loadState/findModifiedValidators.ts +4 -3
  181. package/src/util/loadState/loadValidator.ts +3 -2
  182. package/src/util/signatureSets.ts +84 -8
  183. package/src/util/validator.ts +31 -16
package/lib/util/gloas.js CHANGED
@@ -1,8 +1,8 @@
1
- import { byteArrayEquals } from "@chainsafe/ssz";
2
- import { BUILDER_PAYMENT_THRESHOLD_DENOMINATOR, BUILDER_PAYMENT_THRESHOLD_NUMERATOR, BUILDER_WITHDRAWAL_PREFIX, EFFECTIVE_BALANCE_INCREMENT, SLOTS_PER_EPOCH, } from "@lodestar/params";
1
+ import { BUILDER_INDEX_FLAG, BUILDER_PAYMENT_THRESHOLD_DENOMINATOR, BUILDER_PAYMENT_THRESHOLD_NUMERATOR, BUILDER_WITHDRAWAL_PREFIX, EFFECTIVE_BALANCE_INCREMENT, FAR_FUTURE_EPOCH, MIN_DEPOSIT_AMOUNT, SLOTS_PER_EPOCH, } from "@lodestar/params";
2
+ import { byteArrayEquals } from "@lodestar/utils";
3
3
  import { getBlockRootAtSlot } from "./blockRoot.js";
4
4
  import { computeEpochAtSlot } from "./epoch.js";
5
- export function hasBuilderWithdrawalCredential(withdrawalCredentials) {
5
+ export function isBuilderWithdrawalCredential(withdrawalCredentials) {
6
6
  return withdrawalCredentials[0] === BUILDER_WITHDRAWAL_PREFIX;
7
7
  }
8
8
  export function getBuilderPaymentQuorumThreshold(state) {
@@ -10,10 +10,96 @@ export function getBuilderPaymentQuorumThreshold(state) {
10
10
  BUILDER_PAYMENT_THRESHOLD_NUMERATOR;
11
11
  return Math.floor(quorum / BUILDER_PAYMENT_THRESHOLD_DENOMINATOR);
12
12
  }
13
- export function isBuilderPaymentWithdrawable(state, withdrawal) {
14
- const builder = state.validators.getReadonly(withdrawal.builderIndex);
13
+ /**
14
+ * Check if a validator index represents a builder (has the builder flag set).
15
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#new-is_builder_index
16
+ */
17
+ export function isBuilderIndex(validatorIndex) {
18
+ return (validatorIndex & BUILDER_INDEX_FLAG) !== 0;
19
+ }
20
+ /**
21
+ * Convert a builder index to a flagged validator index for use in Withdrawal containers.
22
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#new-convert_builder_index_to_validator_index
23
+ */
24
+ export function convertBuilderIndexToValidatorIndex(builderIndex) {
25
+ return builderIndex | BUILDER_INDEX_FLAG;
26
+ }
27
+ /**
28
+ * Convert a flagged validator index back to a builder index.
29
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#new-convert_validator_index_to_builder_index
30
+ */
31
+ export function convertValidatorIndexToBuilderIndex(validatorIndex) {
32
+ return validatorIndex & ~BUILDER_INDEX_FLAG;
33
+ }
34
+ /**
35
+ * Check if a builder is active (deposited and not yet withdrawable).
36
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#isactivebuilder
37
+ */
38
+ export function isActiveBuilder(builder, finalizedEpoch) {
39
+ return builder.depositEpoch < finalizedEpoch && builder.withdrawableEpoch === FAR_FUTURE_EPOCH;
40
+ }
41
+ /**
42
+ * Get the total pending balance to withdraw for a builder (from withdrawals + payments).
43
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#new-get_pending_balance_to_withdraw_for_builder
44
+ */
45
+ export function getPendingBalanceToWithdrawForBuilder(state, builderIndex) {
46
+ let pendingBalance = 0;
47
+ // Sum pending withdrawals
48
+ for (let i = 0; i < state.builderPendingWithdrawals.length; i++) {
49
+ const withdrawal = state.builderPendingWithdrawals.getReadonly(i);
50
+ if (withdrawal.builderIndex === builderIndex) {
51
+ pendingBalance += withdrawal.amount;
52
+ }
53
+ }
54
+ // Sum pending payments
55
+ for (let i = 0; i < state.builderPendingPayments.length; i++) {
56
+ const payment = state.builderPendingPayments.getReadonly(i);
57
+ if (payment.withdrawal.builderIndex === builderIndex) {
58
+ pendingBalance += payment.withdrawal.amount;
59
+ }
60
+ }
61
+ return pendingBalance;
62
+ }
63
+ /**
64
+ * Check if a builder has sufficient balance to cover a bid amount.
65
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#new-can_builder_cover_bid
66
+ */
67
+ export function canBuilderCoverBid(state, builderIndex, bidAmount) {
68
+ const builder = state.builders.getReadonly(builderIndex);
69
+ const pendingBalance = getPendingBalanceToWithdrawForBuilder(state, builderIndex);
70
+ const minBalance = MIN_DEPOSIT_AMOUNT + pendingBalance;
71
+ if (builder.balance < minBalance) {
72
+ return false;
73
+ }
74
+ return builder.balance - minBalance >= bidAmount;
75
+ }
76
+ /**
77
+ * Initiate a builder exit by setting their withdrawable epoch.
78
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#new-initiate_builder_exit
79
+ */
80
+ export function initiateBuilderExit(state, builderIndex) {
81
+ const builder = state.builders.get(builderIndex);
82
+ // Return if builder already initiated exit
83
+ if (builder.withdrawableEpoch !== FAR_FUTURE_EPOCH) {
84
+ return;
85
+ }
86
+ // Set builder exit epoch
15
87
  const currentEpoch = computeEpochAtSlot(state.slot);
16
- return builder.withdrawableEpoch >= currentEpoch || !builder.slashed;
88
+ builder.withdrawableEpoch = currentEpoch + state.config.MIN_BUILDER_WITHDRAWABILITY_DELAY;
89
+ }
90
+ /**
91
+ * Find the index of a builder by their public key.
92
+ * Returns null if not found.
93
+ *
94
+ * May consider builder pubkey cache if performance becomes an issue.
95
+ */
96
+ export function findBuilderIndexByPubkey(state, pubkey) {
97
+ for (let i = 0; i < state.builders.length; i++) {
98
+ if (byteArrayEquals(state.builders.getReadonly(i).pubkey, pubkey)) {
99
+ return i;
100
+ }
101
+ }
102
+ return null;
17
103
  }
18
104
  export function isAttestationSameSlot(state, data) {
19
105
  if (data.slot === 0)
@@ -1 +1 @@
1
- {"version":3,"file":"gloas.js","sourceRoot":"","sources":["../../src/util/gloas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EACL,qCAAqC,EACrC,mCAAmC,EACnC,yBAAyB,EACzB,2BAA2B,EAC3B,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAC,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAC,kBAAkB,EAAC,MAAM,YAAY,CAAC;AAG9C,MAAM,UAAU,8BAA8B,CAAC,qBAAiC;IAC9E,OAAO,qBAAqB,CAAC,CAAC,CAAC,KAAK,yBAAyB,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,gCAAgC,CAAC,KAA6B;IAC5E,MAAM,MAAM,GACV,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,4BAA4B,GAAG,2BAA2B,CAAC,GAAG,eAAe,CAAC;QACzG,mCAAmC,CAAC;IAEtC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,qCAAqC,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,KAA6B,EAC7B,UAA0C;IAE1C,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACtE,MAAM,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEpD,OAAO,OAAO,CAAC,iBAAiB,IAAI,YAAY,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAA6B,EAAE,IAAqB;IACxF,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEjC,MAAM,mBAAmB,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACxG,MAAM,kBAAkB,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;IAE5G,OAAO,mBAAmB,IAAI,kBAAkB,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,SAAoB,EAAE,IAAqB;IACxF,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEjC,MAAM,mBAAmB,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3G,MAAM,kBAAkB,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;IAE/G,OAAO,mBAAmB,IAAI,kBAAkB,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAA6B;IAC7D,OAAO,eAAe,CAAC,KAAK,CAAC,yBAAyB,CAAC,SAAS,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;AAC3F,CAAC"}
1
+ {"version":3,"file":"gloas.js","sourceRoot":"","sources":["../../src/util/gloas.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,qCAAqC,EACrC,mCAAmC,EACnC,yBAAyB,EACzB,2BAA2B,EAC3B,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAC,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAC,kBAAkB,EAAC,MAAM,YAAY,CAAC;AAG9C,MAAM,UAAU,6BAA6B,CAAC,qBAAiC;IAC7E,OAAO,qBAAqB,CAAC,CAAC,CAAC,KAAK,yBAAyB,CAAC;AAChE,CAAC;AAED,MAAM,UAAU,gCAAgC,CAAC,KAA6B;IAC5E,MAAM,MAAM,GACV,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,4BAA4B,GAAG,2BAA2B,CAAC,GAAG,eAAe,CAAC;QACzG,mCAAmC,CAAC;IAEtC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,qCAAqC,CAAC,CAAC;AACpE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,cAAsB;IACnD,OAAO,CAAC,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;AACrD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mCAAmC,CAAC,YAA0B;IAC5E,OAAO,YAAY,GAAG,kBAAkB,CAAC;AAC3C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mCAAmC,CAAC,cAA8B;IAChF,OAAO,cAAc,GAAG,CAAC,kBAAkB,CAAC;AAC9C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,OAAsB,EAAE,cAAqB;IAC3E,OAAO,OAAO,CAAC,YAAY,GAAG,cAAc,IAAI,OAAO,CAAC,iBAAiB,KAAK,gBAAgB,CAAC;AACjG,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qCAAqC,CACnD,KAA6B,EAC7B,YAA0B;IAE1B,IAAI,cAAc,GAAG,CAAC,CAAC;IAEvB,0BAA0B;IAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,yBAAyB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAChE,MAAM,UAAU,GAAG,KAAK,CAAC,yBAAyB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAClE,IAAI,UAAU,CAAC,YAAY,KAAK,YAAY,EAAE,CAAC;YAC7C,cAAc,IAAI,UAAU,CAAC,MAAM,CAAC;QACtC,CAAC;IACH,CAAC;IAED,uBAAuB;IACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7D,MAAM,OAAO,GAAG,KAAK,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC5D,IAAI,OAAO,CAAC,UAAU,CAAC,YAAY,KAAK,YAAY,EAAE,CAAC;YACrD,cAAc,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAChC,KAA6B,EAC7B,YAA0B,EAC1B,SAAiB;IAEjB,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IACzD,MAAM,cAAc,GAAG,qCAAqC,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAClF,MAAM,UAAU,GAAG,kBAAkB,GAAG,cAAc,CAAC;IAEvD,IAAI,OAAO,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,GAAG,UAAU,IAAI,SAAS,CAAC;AACnD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAA6B,EAAE,YAA0B;IAC3F,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAEjD,2CAA2C;IAC3C,IAAI,OAAO,CAAC,iBAAiB,KAAK,gBAAgB,EAAE,CAAC;QACnD,OAAO;IACT,CAAC;IAED,yBAAyB;IACzB,MAAM,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpD,OAAO,CAAC,iBAAiB,GAAG,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,iCAAiC,CAAC;AAC5F,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CAAC,KAA6B,EAAE,MAAkB;IACxF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/C,IAAI,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;YAClE,OAAO,CAAC,CAAC;QACX,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAA6B,EAAE,IAAqB;IACxF,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEjC,MAAM,mBAAmB,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACxG,MAAM,kBAAkB,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;IAE5G,OAAO,mBAAmB,IAAI,kBAAkB,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,SAAoB,EAAE,IAAqB;IACxF,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEjC,MAAM,mBAAmB,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3G,MAAM,kBAAkB,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;IAE/G,OAAO,mBAAmB,IAAI,kBAAkB,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAA6B;IAC7D,OAAO,eAAe,CAAC,KAAK,CAAC,yBAAyB,CAAC,SAAS,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;AAC3F,CAAC"}
@@ -15,6 +15,7 @@ export * from "./epochShuffling.js";
15
15
  export * from "./execution.js";
16
16
  export * from "./finality.js";
17
17
  export * from "./genesis.js";
18
+ export * from "./gloas.js";
18
19
  export * from "./interop.js";
19
20
  export * from "./loadState/index.js";
20
21
  export * from "./rootCache.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC"}
package/lib/util/index.js CHANGED
@@ -15,6 +15,7 @@ export * from "./epochShuffling.js";
15
15
  export * from "./execution.js";
16
16
  export * from "./finality.js";
17
17
  export * from "./genesis.js";
18
+ export * from "./gloas.js";
18
19
  export * from "./interop.js";
19
20
  export * from "./loadState/index.js";
20
21
  export * from "./rootCache.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC"}
@@ -1,4 +1,4 @@
1
- import { toBufferBE } from "bigint-buffer";
1
+ import { toBufferBE } from "@vekexasia/bigint-buffer2";
2
2
  import { digest } from "@chainsafe/as-sha256";
3
3
  import { SecretKey } from "@chainsafe/blst";
4
4
  import { bytesToBigInt, intToBytes } from "@lodestar/utils";
@@ -1 +1 @@
1
- {"version":3,"file":"interop.js","sourceRoot":"","sources":["../../src/util/interop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,MAAM,EAAC,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAE1D,IAAI,UAAkB,CAAC;AACvB,SAAS,aAAa;IACpB,IAAI,CAAC,UAAU;QAAE,UAAU,GAAG,MAAM,CAAC,+EAA+E,CAAC,CAAC;IACtH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,cAAsB;IACtD,OAAO,KAAK,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,cAAc,EAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACnD,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC5C,MAAM,WAAW,GAAG,aAAa,EAAE,CAAC;IACpC,MAAM,cAAc,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,WAAW,EAAE,EAAE,CAAC,CAAC;IAClG,OAAO,SAAS,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;AAC7C,CAAC"}
1
+ {"version":3,"file":"interop.js","sourceRoot":"","sources":["../../src/util/interop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAC,MAAM,EAAC,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAE1D,IAAI,UAAkB,CAAC;AACvB,SAAS,aAAa;IACpB,IAAI,CAAC,UAAU;QAAE,UAAU,GAAG,MAAM,CAAC,+EAA+E,CAAC,CAAC;IACtH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,cAAsB;IACtD,OAAO,KAAK,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,cAAc,EAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACnD,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC5C,MAAM,WAAW,GAAG,aAAa,EAAE,CAAC;IACpC,MAAM,cAAc,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,WAAW,EAAE,EAAE,CAAC,CAAC;IAClG,OAAO,SAAS,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;AAC7C,CAAC"}
@@ -1,7 +1,7 @@
1
1
  export declare const INACTIVITY_SCORE_SIZE = 8;
2
2
  /**
3
3
  * As monitored on mainnet, inactivityScores are not changed much and they are mostly 0
4
- * Using Buffer.compare is the fastest way as noted in `./findModifiedValidators.ts`
4
+ * Using byteArrayEquals is the optimal way as noted in `./findModifiedValidators.ts`
5
5
  * @returns output parameter modifiedValidators: validator indices that are modified
6
6
  */
7
7
  export declare function findModifiedInactivityScores(inactivityScoresBytes: Uint8Array, inactivityScoresBytes2: Uint8Array, modifiedValidators: number[], validatorOffset?: number): void;
@@ -1 +1 @@
1
- {"version":3,"file":"findModifiedInactivityScores.d.ts","sourceRoot":"","sources":["../../../src/util/loadState/findModifiedInactivityScores.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,qBAAqB,EAAE,UAAU,EACjC,sBAAsB,EAAE,UAAU,EAClC,kBAAkB,EAAE,MAAM,EAAE,EAC5B,eAAe,SAAI,GAClB,IAAI,CAiCN"}
1
+ {"version":3,"file":"findModifiedInactivityScores.d.ts","sourceRoot":"","sources":["../../../src/util/loadState/findModifiedInactivityScores.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,qBAAqB,EAAE,UAAU,EACjC,sBAAsB,EAAE,UAAU,EAClC,kBAAkB,EAAE,MAAM,EAAE,EAC5B,eAAe,SAAI,GAClB,IAAI,CAiCN"}
@@ -1,8 +1,9 @@
1
+ import { byteArrayEquals } from "@lodestar/utils";
1
2
  // UintNum64 = 8 bytes
2
3
  export const INACTIVITY_SCORE_SIZE = 8;
3
4
  /**
4
5
  * As monitored on mainnet, inactivityScores are not changed much and they are mostly 0
5
- * Using Buffer.compare is the fastest way as noted in `./findModifiedValidators.ts`
6
+ * Using byteArrayEquals is the optimal way as noted in `./findModifiedValidators.ts`
6
7
  * @returns output parameter modifiedValidators: validator indices that are modified
7
8
  */
8
9
  export function findModifiedInactivityScores(inactivityScoresBytes, inactivityScoresBytes2, modifiedValidators, validatorOffset = 0) {
@@ -12,7 +13,7 @@ export function findModifiedInactivityScores(inactivityScoresBytes, inactivitySc
12
13
  " vs " +
13
14
  inactivityScoresBytes2.length);
14
15
  }
15
- if (Buffer.compare(inactivityScoresBytes, inactivityScoresBytes2) === 0) {
16
+ if (byteArrayEquals(inactivityScoresBytes, inactivityScoresBytes2)) {
16
17
  return;
17
18
  }
18
19
  if (inactivityScoresBytes.length === INACTIVITY_SCORE_SIZE) {
@@ -1 +1 @@
1
- {"version":3,"file":"findModifiedInactivityScores.js","sourceRoot":"","sources":["../../../src/util/loadState/findModifiedInactivityScores.ts"],"names":[],"mappings":"AAAA,sBAAsB;AACtB,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAEvC;;;;GAIG;AACH,MAAM,UAAU,4BAA4B,CAC1C,qBAAiC,EACjC,sBAAkC,EAClC,kBAA4B,EAC5B,eAAe,GAAG,CAAC;IAEnB,IAAI,qBAAqB,CAAC,MAAM,KAAK,sBAAsB,CAAC,MAAM,EAAE,CAAC;QACnE,MAAM,IAAI,KAAK,CACb,iEAAiE;YAC/D,qBAAqB,CAAC,MAAM;YAC5B,MAAM;YACN,sBAAsB,CAAC,MAAM,CAChC,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC;QACxE,OAAO;IACT,CAAC;IAED,IAAI,qBAAqB,CAAC,MAAM,KAAK,qBAAqB,EAAE,CAAC;QAC3D,kBAAkB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACzC,OAAO;IACT,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,GAAG,qBAAqB,CAAC,CAAC;IACtF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;IACnD,4BAA4B,CAC1B,qBAAqB,CAAC,QAAQ,CAAC,CAAC,EAAE,aAAa,GAAG,qBAAqB,CAAC,EACxE,sBAAsB,CAAC,QAAQ,CAAC,CAAC,EAAE,aAAa,GAAG,qBAAqB,CAAC,EACzE,kBAAkB,EAClB,eAAe,CAChB,CAAC;IACF,4BAA4B,CAC1B,qBAAqB,CAAC,QAAQ,CAAC,aAAa,GAAG,qBAAqB,CAAC,EACrE,sBAAsB,CAAC,QAAQ,CAAC,aAAa,GAAG,qBAAqB,CAAC,EACtE,kBAAkB,EAClB,eAAe,GAAG,aAAa,CAChC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"findModifiedInactivityScores.js","sourceRoot":"","sources":["../../../src/util/loadState/findModifiedInactivityScores.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAEhD,sBAAsB;AACtB,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAEvC;;;;GAIG;AACH,MAAM,UAAU,4BAA4B,CAC1C,qBAAiC,EACjC,sBAAkC,EAClC,kBAA4B,EAC5B,eAAe,GAAG,CAAC;IAEnB,IAAI,qBAAqB,CAAC,MAAM,KAAK,sBAAsB,CAAC,MAAM,EAAE,CAAC;QACnE,MAAM,IAAI,KAAK,CACb,iEAAiE;YAC/D,qBAAqB,CAAC,MAAM;YAC5B,MAAM;YACN,sBAAsB,CAAC,MAAM,CAChC,CAAC;IACJ,CAAC;IAED,IAAI,eAAe,CAAC,qBAAqB,EAAE,sBAAsB,CAAC,EAAE,CAAC;QACnE,OAAO;IACT,CAAC;IAED,IAAI,qBAAqB,CAAC,MAAM,KAAK,qBAAqB,EAAE,CAAC;QAC3D,kBAAkB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACzC,OAAO;IACT,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,GAAG,qBAAqB,CAAC,CAAC;IACtF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;IACnD,4BAA4B,CAC1B,qBAAqB,CAAC,QAAQ,CAAC,CAAC,EAAE,aAAa,GAAG,qBAAqB,CAAC,EACxE,sBAAsB,CAAC,QAAQ,CAAC,CAAC,EAAE,aAAa,GAAG,qBAAqB,CAAC,EACzE,kBAAkB,EAClB,eAAe,CAChB,CAAC;IACF,4BAA4B,CAC1B,qBAAqB,CAAC,QAAQ,CAAC,aAAa,GAAG,qBAAqB,CAAC,EACrE,sBAAsB,CAAC,QAAQ,CAAC,aAAa,GAAG,qBAAqB,CAAC,EACtE,kBAAkB,EAClB,eAAe,GAAG,aAAa,CAChC,CAAC;AACJ,CAAC"}
@@ -1,8 +1,8 @@
1
1
  /**
2
- * Find modified validators by comparing two validators bytes using Buffer.compare() recursively
2
+ * Find modified validators by comparing two validators bytes using byteArrayEquals() recursively
3
3
  * - As noted in packages/state-transition/test/perf/util/loadState/findModifiedValidators.test.ts, serializing validators and compare Uint8Array is the fastest way
4
4
  * - The performance is quite stable and can afford a lot of difference in validators (the benchmark tested up to 10k but it's not likely we have that difference in mainnet)
5
- * - Also packages/state-transition/test/perf/misc/byteArrayEquals.test.ts shows that Buffer.compare() is very efficient for large Uint8Array
5
+ * - byteArrayEquals() uses the optimal comparison method based on array size
6
6
  *
7
7
  * @returns output parameter modifiedValidators: validator indices that are modified
8
8
  */
@@ -1 +1 @@
1
- {"version":3,"file":"findModifiedValidators.d.ts","sourceRoot":"","sources":["../../../src/util/loadState/findModifiedValidators.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,eAAe,EAAE,UAAU,EAC3B,gBAAgB,EAAE,UAAU,EAC5B,kBAAkB,EAAE,MAAM,EAAE,EAC5B,eAAe,SAAI,GAClB,IAAI,CA8BN"}
1
+ {"version":3,"file":"findModifiedValidators.d.ts","sourceRoot":"","sources":["../../../src/util/loadState/findModifiedValidators.ts"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,eAAe,EAAE,UAAU,EAC3B,gBAAgB,EAAE,UAAU,EAC5B,kBAAkB,EAAE,MAAM,EAAE,EAC5B,eAAe,SAAI,GAClB,IAAI,CA8BN"}
@@ -1,9 +1,10 @@
1
+ import { byteArrayEquals } from "@lodestar/utils";
1
2
  import { VALIDATOR_BYTES_SIZE } from "../sszBytes.js";
2
3
  /**
3
- * Find modified validators by comparing two validators bytes using Buffer.compare() recursively
4
+ * Find modified validators by comparing two validators bytes using byteArrayEquals() recursively
4
5
  * - As noted in packages/state-transition/test/perf/util/loadState/findModifiedValidators.test.ts, serializing validators and compare Uint8Array is the fastest way
5
6
  * - The performance is quite stable and can afford a lot of difference in validators (the benchmark tested up to 10k but it's not likely we have that difference in mainnet)
6
- * - Also packages/state-transition/test/perf/misc/byteArrayEquals.test.ts shows that Buffer.compare() is very efficient for large Uint8Array
7
+ * - byteArrayEquals() uses the optimal comparison method based on array size
7
8
  *
8
9
  * @returns output parameter modifiedValidators: validator indices that are modified
9
10
  */
@@ -11,7 +12,7 @@ export function findModifiedValidators(validatorsBytes, validatorsBytes2, modifi
11
12
  if (validatorsBytes.length !== validatorsBytes2.length) {
12
13
  throw new Error("validatorsBytes.length !== validatorsBytes2.length " + validatorsBytes.length + " vs " + validatorsBytes2.length);
13
14
  }
14
- if (Buffer.compare(validatorsBytes, validatorsBytes2) === 0) {
15
+ if (byteArrayEquals(validatorsBytes, validatorsBytes2)) {
15
16
  return;
16
17
  }
17
18
  if (validatorsBytes.length === VALIDATOR_BYTES_SIZE) {
@@ -1 +1 @@
1
- {"version":3,"file":"findModifiedValidators.js","sourceRoot":"","sources":["../../../src/util/loadState/findModifiedValidators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAC,MAAM,gBAAgB,CAAC;AAEpD;;;;;;;GAOG;AACH,MAAM,UAAU,sBAAsB,CACpC,eAA2B,EAC3B,gBAA4B,EAC5B,kBAA4B,EAC5B,eAAe,GAAG,CAAC;IAEnB,IAAI,eAAe,CAAC,MAAM,KAAK,gBAAgB,CAAC,MAAM,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CACb,qDAAqD,GAAG,eAAe,CAAC,MAAM,GAAG,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAClH,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5D,OAAO;IACT,CAAC;IAED,IAAI,eAAe,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;QACpD,kBAAkB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACzC,OAAO;IACT,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,GAAG,oBAAoB,CAAC,CAAC;IAC/E,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;IACnD,sBAAsB,CACpB,eAAe,CAAC,QAAQ,CAAC,CAAC,EAAE,aAAa,GAAG,oBAAoB,CAAC,EACjE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,EAAE,aAAa,GAAG,oBAAoB,CAAC,EAClE,kBAAkB,EAClB,eAAe,CAChB,CAAC;IACF,sBAAsB,CACpB,eAAe,CAAC,QAAQ,CAAC,aAAa,GAAG,oBAAoB,CAAC,EAC9D,gBAAgB,CAAC,QAAQ,CAAC,aAAa,GAAG,oBAAoB,CAAC,EAC/D,kBAAkB,EAClB,eAAe,GAAG,aAAa,CAChC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"findModifiedValidators.js","sourceRoot":"","sources":["../../../src/util/loadState/findModifiedValidators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAC,oBAAoB,EAAC,MAAM,gBAAgB,CAAC;AAEpD;;;;;;;GAOG;AACH,MAAM,UAAU,sBAAsB,CACpC,eAA2B,EAC3B,gBAA4B,EAC5B,kBAA4B,EAC5B,eAAe,GAAG,CAAC;IAEnB,IAAI,eAAe,CAAC,MAAM,KAAK,gBAAgB,CAAC,MAAM,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CACb,qDAAqD,GAAG,eAAe,CAAC,MAAM,GAAG,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAClH,CAAC;IACJ,CAAC;IAED,IAAI,eAAe,CAAC,eAAe,EAAE,gBAAgB,CAAC,EAAE,CAAC;QACvD,OAAO;IACT,CAAC;IAED,IAAI,eAAe,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;QACpD,kBAAkB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACzC,OAAO;IACT,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,GAAG,oBAAoB,CAAC,CAAC;IAC/E,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;IACnD,sBAAsB,CACpB,eAAe,CAAC,QAAQ,CAAC,CAAC,EAAE,aAAa,GAAG,oBAAoB,CAAC,EACjE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,EAAE,aAAa,GAAG,oBAAoB,CAAC,EAClE,kBAAkB,EAClB,eAAe,CAChB,CAAC;IACF,sBAAsB,CACpB,eAAe,CAAC,QAAQ,CAAC,aAAa,GAAG,oBAAoB,CAAC,EAC9D,gBAAgB,CAAC,QAAQ,CAAC,aAAa,GAAG,oBAAoB,CAAC,EAC/D,kBAAkB,EAClB,eAAe,GAAG,aAAa,CAChC,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"loadValidator.d.ts","sourceRoot":"","sources":["../../../src/util/loadState/loadValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,cAAc,EAAoC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAGtF;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,aAAa,EAAE,eAAe,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,EAC3D,iBAAiB,EAAE,UAAU,GAC5B,eAAe,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAU9C;AAuBD;;GAEG;AACH,wBAAgB,kCAAkC,CAChD,MAAM,EAAE,eAAe,EACvB,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,cAAc,EAAE,GACjC,MAAM,EAAE,CAuBV"}
1
+ {"version":3,"file":"loadValidator.d.ts","sourceRoot":"","sources":["../../../src/util/loadState/loadValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,cAAc,EAAoC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAItF;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,aAAa,EAAE,eAAe,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,EAC3D,iBAAiB,EAAE,UAAU,GAC5B,eAAe,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAU9C;AAuBD;;GAEG;AACH,wBAAgB,kCAAkC,CAChD,MAAM,EAAE,eAAe,EACvB,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,cAAc,EAAE,GACjC,MAAM,EAAE,CAuBV"}
@@ -1,4 +1,5 @@
1
1
  import { deserializeContainerIgnoreFields, ssz } from "@lodestar/types";
2
+ import { byteArrayEquals } from "@lodestar/utils";
2
3
  import { getStateTypeFromBytes } from "../sszBytes.js";
3
4
  /**
4
5
  * Load validator from bytes given a seed validator.
@@ -22,11 +23,11 @@ export function loadValidator(seedValidator, newValidatorBytes) {
22
23
  function getSameFields(validator, validatorBytes) {
23
24
  const ignoredFields = [];
24
25
  const pubkey = validatorBytes.subarray(0, 48);
25
- if (Buffer.compare(pubkey, validator.pubkey) === 0) {
26
+ if (byteArrayEquals(pubkey, validator.pubkey)) {
26
27
  ignoredFields.push("pubkey");
27
28
  }
28
29
  const withdrawalCredentials = validatorBytes.subarray(48, 80);
29
- if (Buffer.compare(withdrawalCredentials, validator.withdrawalCredentials) === 0) {
30
+ if (byteArrayEquals(withdrawalCredentials, validator.withdrawalCredentials)) {
30
31
  ignoredFields.push("withdrawalCredentials");
31
32
  }
32
33
  return ignoredFields;
@@ -1 +1 @@
1
- {"version":3,"file":"loadValidator.js","sourceRoot":"","sources":["../../../src/util/loadState/loadValidator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loadValidator.js","sourceRoot":"","sources":["../../../src/util/loadState/loadValidator.ts"],"names":[],"mappings":"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"}
@@ -1,23 +1,56 @@
1
1
  import { PublicKey } from "@chainsafe/blst";
2
2
  import { Root } from "@lodestar/types";
3
+ import { Index2PubkeyCache } from "../cache/pubkeyCache.js";
3
4
  export declare enum SignatureSetType {
4
5
  single = "single",
5
- aggregate = "aggregate"
6
+ aggregate = "aggregate",
7
+ /**
8
+ * Single signature with validator index instead of pubkey.
9
+ * Pubkey lookup is deferred to verification time.
10
+ */
11
+ indexed = "indexed"
6
12
  }
13
+ /**
14
+ * Single signature with pubkey directly.
15
+ * Used when pubkey comes from the message itself (e.g. BLS to execution change).
16
+ */
7
17
  export type SingleSignatureSet = {
8
18
  type: SignatureSetType.single;
9
19
  pubkey: PublicKey;
10
20
  signingRoot: Root;
11
21
  signature: Uint8Array;
12
22
  };
23
+ /**
24
+ * Single signature with validator index.
25
+ * Pubkey is looked up at verification time.
26
+ */
27
+ export type IndexedSignatureSet = {
28
+ type: SignatureSetType.indexed;
29
+ index: number;
30
+ signingRoot: Root;
31
+ signature: Uint8Array;
32
+ };
33
+ /**
34
+ * Aggregate signature with validator indices.
35
+ * Pubkeys are looked up and aggregated at verification time.
36
+ */
13
37
  export type AggregatedSignatureSet = {
14
38
  type: SignatureSetType.aggregate;
15
- pubkeys: PublicKey[];
39
+ indices: number[];
16
40
  signingRoot: Root;
17
41
  signature: Uint8Array;
18
42
  };
19
- export type ISignatureSet = SingleSignatureSet | AggregatedSignatureSet;
20
- export declare function verifySignatureSet(signatureSet: ISignatureSet): boolean;
43
+ export type ISignatureSet = SingleSignatureSet | IndexedSignatureSet | AggregatedSignatureSet;
44
+ /**
45
+ * Get the pubkey for a signature set, performing aggregation if necessary.
46
+ * Requires index2pubkey cache for indexed and aggregate sets.
47
+ */
48
+ export declare function getSignatureSetPubkey(signatureSet: ISignatureSet, index2pubkey: Index2PubkeyCache): PublicKey;
49
+ export declare function verifySignatureSet(signatureSet: SingleSignatureSet, index2pubkey?: Index2PubkeyCache): boolean;
50
+ export declare function verifySignatureSet(signatureSet: IndexedSignatureSet, index2pubkey: Index2PubkeyCache): boolean;
51
+ export declare function verifySignatureSet(signatureSet: AggregatedSignatureSet, index2pubkey: Index2PubkeyCache): boolean;
52
+ export declare function verifySignatureSet(signatureSet: ISignatureSet, index2pubkey: Index2PubkeyCache): boolean;
21
53
  export declare function createSingleSignatureSetFromComponents(pubkey: PublicKey, signingRoot: Root, signature: Uint8Array): SingleSignatureSet;
22
- export declare function createAggregateSignatureSetFromComponents(pubkeys: PublicKey[], signingRoot: Root, signature: Uint8Array): AggregatedSignatureSet;
54
+ export declare function createIndexedSignatureSetFromComponents(index: number, signingRoot: Root, signature: Uint8Array): IndexedSignatureSet;
55
+ export declare function createAggregateSignatureSetFromComponents(indices: number[], signingRoot: Root, signature: Uint8Array): AggregatedSignatureSet;
23
56
  //# sourceMappingURL=signatureSets.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"signatureSets.d.ts","sourceRoot":"","sources":["../../src/util/signatureSets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAyC,MAAM,iBAAiB,CAAC;AAClF,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAErC,oBAAY,gBAAgB;IAC1B,MAAM,WAAW;IACjB,SAAS,cAAc;CACxB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC;IAC9B,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,IAAI,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC;IACjC,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,WAAW,EAAE,IAAI,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,kBAAkB,GAAG,sBAAsB,CAAC;AAExE,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,aAAa,GAAG,OAAO,CAcvE;AAED,wBAAgB,sCAAsC,CACpD,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,IAAI,EACjB,SAAS,EAAE,UAAU,GACpB,kBAAkB,CAOpB;AAED,wBAAgB,yCAAyC,CACvD,OAAO,EAAE,SAAS,EAAE,EACpB,WAAW,EAAE,IAAI,EACjB,SAAS,EAAE,UAAU,GACpB,sBAAsB,CAOxB"}
1
+ {"version":3,"file":"signatureSets.d.ts","sourceRoot":"","sources":["../../src/util/signatureSets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAA8D,MAAM,iBAAiB,CAAC;AACvG,OAAO,EAAC,IAAI,EAAC,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAE1D,oBAAY,gBAAgB;IAC1B,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB;;;OAGG;IACH,OAAO,YAAY;CACpB;AAED;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC;IAC9B,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,IAAI,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,IAAI,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC;IACjC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,IAAI,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,kBAAkB,GAAG,mBAAmB,GAAG,sBAAsB,CAAC;AAE9F;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,GAAG,SAAS,CAgB7G;AAED,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,kBAAkB,EAAE,YAAY,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC;AAChH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,mBAAmB,EAAE,YAAY,EAAE,iBAAiB,GAAG,OAAO,CAAC;AAChH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,sBAAsB,EAAE,YAAY,EAAE,iBAAiB,GAAG,OAAO,CAAC;AACnH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,GAAG,OAAO,CAAC;AA6B1G,wBAAgB,sCAAsC,CACpD,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,IAAI,EACjB,SAAS,EAAE,UAAU,GACpB,kBAAkB,CAOpB;AAED,wBAAgB,uCAAuC,CACrD,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,IAAI,EACjB,SAAS,EAAE,UAAU,GACpB,mBAAmB,CAOrB;AAED,wBAAgB,yCAAyC,CACvD,OAAO,EAAE,MAAM,EAAE,EACjB,WAAW,EAAE,IAAI,EACjB,SAAS,EAAE,UAAU,GACpB,sBAAsB,CAOxB"}
@@ -1,17 +1,51 @@
1
- import { Signature, fastAggregateVerify, verify } from "@chainsafe/blst";
1
+ import { Signature, aggregatePublicKeys, fastAggregateVerify, verify } from "@chainsafe/blst";
2
2
  export var SignatureSetType;
3
3
  (function (SignatureSetType) {
4
4
  SignatureSetType["single"] = "single";
5
5
  SignatureSetType["aggregate"] = "aggregate";
6
+ /**
7
+ * Single signature with validator index instead of pubkey.
8
+ * Pubkey lookup is deferred to verification time.
9
+ */
10
+ SignatureSetType["indexed"] = "indexed";
6
11
  })(SignatureSetType || (SignatureSetType = {}));
7
- export function verifySignatureSet(signatureSet) {
12
+ /**
13
+ * Get the pubkey for a signature set, performing aggregation if necessary.
14
+ * Requires index2pubkey cache for indexed and aggregate sets.
15
+ */
16
+ export function getSignatureSetPubkey(signatureSet, index2pubkey) {
17
+ switch (signatureSet.type) {
18
+ case SignatureSetType.single:
19
+ return signatureSet.pubkey;
20
+ case SignatureSetType.indexed:
21
+ return index2pubkey[signatureSet.index];
22
+ case SignatureSetType.aggregate: {
23
+ const pubkeys = signatureSet.indices.map((i) => index2pubkey[i]);
24
+ return aggregatePublicKeys(pubkeys);
25
+ }
26
+ default:
27
+ throw Error("Unknown signature set type");
28
+ }
29
+ }
30
+ export function verifySignatureSet(signatureSet, index2pubkey) {
8
31
  // All signatures are not trusted and must be group checked (p2.subgroup_check)
9
32
  const signature = Signature.fromBytes(signatureSet.signature, true);
10
33
  switch (signatureSet.type) {
11
34
  case SignatureSetType.single:
12
35
  return verify(signatureSet.signingRoot, signatureSet.pubkey, signature);
13
- case SignatureSetType.aggregate:
14
- return fastAggregateVerify(signatureSet.signingRoot, signatureSet.pubkeys, signature);
36
+ case SignatureSetType.indexed: {
37
+ if (!index2pubkey) {
38
+ throw Error("index2pubkey required for indexed signature set");
39
+ }
40
+ return verify(signatureSet.signingRoot, index2pubkey[signatureSet.index], signature);
41
+ }
42
+ case SignatureSetType.aggregate: {
43
+ if (!index2pubkey) {
44
+ throw Error("index2pubkey required for aggregate signature set");
45
+ }
46
+ const pubkeys = signatureSet.indices.map((i) => index2pubkey[i]);
47
+ return fastAggregateVerify(signatureSet.signingRoot, pubkeys, signature);
48
+ }
15
49
  default:
16
50
  throw Error("Unknown signature set type");
17
51
  }
@@ -24,10 +58,18 @@ export function createSingleSignatureSetFromComponents(pubkey, signingRoot, sign
24
58
  signature,
25
59
  };
26
60
  }
27
- export function createAggregateSignatureSetFromComponents(pubkeys, signingRoot, signature) {
61
+ export function createIndexedSignatureSetFromComponents(index, signingRoot, signature) {
62
+ return {
63
+ type: SignatureSetType.indexed,
64
+ index,
65
+ signingRoot,
66
+ signature,
67
+ };
68
+ }
69
+ export function createAggregateSignatureSetFromComponents(indices, signingRoot, signature) {
28
70
  return {
29
71
  type: SignatureSetType.aggregate,
30
- pubkeys,
72
+ indices,
31
73
  signingRoot,
32
74
  signature,
33
75
  };
@@ -1 +1 @@
1
- {"version":3,"file":"signatureSets.js","sourceRoot":"","sources":["../../src/util/signatureSets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,SAAS,EAAE,mBAAmB,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAGlF,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,qCAAiB,CAAA;IACjB,2CAAuB,CAAA;AACzB,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B;AAkBD,MAAM,UAAU,kBAAkB,CAAC,YAA2B;IAC5D,+EAA+E;IAC/E,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAEpE,QAAQ,YAAY,CAAC,IAAI,EAAE,CAAC;QAC1B,KAAK,gBAAgB,CAAC,MAAM;YAC1B,OAAO,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAE1E,KAAK,gBAAgB,CAAC,SAAS;YAC7B,OAAO,mBAAmB,CAAC,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAExF;YACE,MAAM,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC;AAED,MAAM,UAAU,sCAAsC,CACpD,MAAiB,EACjB,WAAiB,EACjB,SAAqB;IAErB,OAAO;QACL,IAAI,EAAE,gBAAgB,CAAC,MAAM;QAC7B,MAAM;QACN,WAAW;QACX,SAAS;KACV,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yCAAyC,CACvD,OAAoB,EACpB,WAAiB,EACjB,SAAqB;IAErB,OAAO;QACL,IAAI,EAAE,gBAAgB,CAAC,SAAS;QAChC,OAAO;QACP,WAAW;QACX,SAAS;KACV,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"signatureSets.js","sourceRoot":"","sources":["../../src/util/signatureSets.ts"],"names":[],"mappings":"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"}
@@ -26,5 +26,10 @@ export declare function getBalanceChurnLimitFromCache(epochCtx: EpochCache): num
26
26
  export declare function getActivationExitChurnLimit(epochCtx: EpochCache): number;
27
27
  export declare function getConsolidationChurnLimit(epochCtx: EpochCache): number;
28
28
  export declare function getMaxEffectiveBalance(withdrawalCredentials: Uint8Array): number;
29
- export declare function getPendingBalanceToWithdraw(fork: ForkSeq, state: CachedBeaconStateElectra | CachedBeaconStateGloas, validatorIndex: ValidatorIndex): number;
29
+ /**
30
+ * Check if validator is partially withdrawable.
31
+ * https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/electra/beacon-chain.md#modified-is_partially_withdrawable_validator
32
+ */
33
+ export declare function isPartiallyWithdrawableValidator(fork: ForkSeq, validator: phase0.Validator, balance: number): boolean;
34
+ export declare function getPendingBalanceToWithdraw(state: CachedBeaconStateElectra | CachedBeaconStateGloas, validatorIndex: ValidatorIndex): number;
30
35
  //# sourceMappingURL=validator.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/util/validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAEL,OAAO,EAGR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,KAAK,EAAE,cAAc,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAAC,mBAAmB,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,UAAU,EAAC,MAAM,aAAa,CAAC;AAG9G;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAEpF;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAEvF;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK,GAAG,WAAW,CAW/F;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAKpH;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAE3F;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,4BAA4B,EAAE,MAAM,EACpC,kBAAkB,EAAE,MAAM,EAC1B,qBAAqB,EAAE,MAAM,GAC5B,MAAM,CAQR;AAED,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,UAAU,GAAG,MAAM,CAM1E;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,UAAU,GAAG,MAAM,CAExE;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,UAAU,GAAG,MAAM,CAEvE;AAED,wBAAgB,sBAAsB,CAAC,qBAAqB,EAAE,UAAU,GAAG,MAAM,CAMhF;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,wBAAwB,GAAG,sBAAsB,EACxD,cAAc,EAAE,cAAc,GAC7B,MAAM,CAuBR"}
1
+ {"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/util/validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAEL,OAAO,EAIR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,KAAK,EAAE,cAAc,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAAC,mBAAmB,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,UAAU,EAAC,MAAM,aAAa,CAAC;AAI9G;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAEpF;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAEvF;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK,GAAG,WAAW,CAW/F;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAKpH;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAE3F;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,4BAA4B,EAAE,MAAM,EACpC,kBAAkB,EAAE,MAAM,EAC1B,qBAAqB,EAAE,MAAM,GAC5B,MAAM,CAQR;AAED,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,UAAU,GAAG,MAAM,CAM1E;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,UAAU,GAAG,MAAM,CAExE;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,UAAU,GAAG,MAAM,CAEvE;AAED,wBAAgB,sBAAsB,CAAC,qBAAqB,EAAE,UAAU,GAAG,MAAM,CAMhF;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAsBrH;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,wBAAwB,GAAG,sBAAsB,EACxD,cAAc,EAAE,cAAc,GAC7B,MAAM,CASR"}
@@ -1,6 +1,7 @@
1
- import { EFFECTIVE_BALANCE_INCREMENT, ForkSeq, MAX_EFFECTIVE_BALANCE_ELECTRA, MIN_ACTIVATION_BALANCE, } from "@lodestar/params";
1
+ import { EFFECTIVE_BALANCE_INCREMENT, ForkSeq, MAX_EFFECTIVE_BALANCE, MAX_EFFECTIVE_BALANCE_ELECTRA, MIN_ACTIVATION_BALANCE, } from "@lodestar/params";
2
2
  import { intDiv } from "@lodestar/utils";
3
- import { hasCompoundingWithdrawalCredential } from "./electra.js";
3
+ import { hasEth1WithdrawalCredential } from "./capella.js";
4
+ import { hasCompoundingWithdrawalCredential, hasExecutionWithdrawalCredential } from "./electra.js";
4
5
  /**
5
6
  * Check if [[validator]] is active
6
7
  */
@@ -61,26 +62,35 @@ export function getMaxEffectiveBalance(withdrawalCredentials) {
61
62
  }
62
63
  return MIN_ACTIVATION_BALANCE;
63
64
  }
64
- export function getPendingBalanceToWithdraw(fork, state, validatorIndex) {
65
+ /**
66
+ * Check if validator is partially withdrawable.
67
+ * https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/electra/beacon-chain.md#modified-is_partially_withdrawable_validator
68
+ */
69
+ export function isPartiallyWithdrawableValidator(fork, validator, balance) {
70
+ const isPostElectra = fork >= ForkSeq.electra;
71
+ // Check withdrawal credentials
72
+ const hasWithdrawableCredentials = isPostElectra
73
+ ? hasExecutionWithdrawalCredential(validator.withdrawalCredentials)
74
+ : hasEth1WithdrawalCredential(validator.withdrawalCredentials);
75
+ if (!hasWithdrawableCredentials) {
76
+ return false;
77
+ }
78
+ // Get max effective balance based on fork
79
+ const maxEffectiveBalance = isPostElectra
80
+ ? getMaxEffectiveBalance(validator.withdrawalCredentials)
81
+ : MAX_EFFECTIVE_BALANCE;
82
+ // Check if at max effective balance and has excess balance
83
+ const hasMaxEffectiveBalance = validator.effectiveBalance === maxEffectiveBalance;
84
+ const hasExcessBalance = balance > maxEffectiveBalance;
85
+ return hasMaxEffectiveBalance && hasExcessBalance;
86
+ }
87
+ export function getPendingBalanceToWithdraw(state, validatorIndex) {
65
88
  let total = 0;
66
89
  for (const item of state.pendingPartialWithdrawals.getAllReadonly()) {
67
90
  if (item.validatorIndex === validatorIndex) {
68
91
  total += Number(item.amount);
69
92
  }
70
93
  }
71
- if (fork >= ForkSeq.gloas) {
72
- const stateGloas = state;
73
- for (const item of stateGloas.builderPendingWithdrawals.getAllReadonly()) {
74
- if (item.builderIndex === validatorIndex) {
75
- total += item.amount;
76
- }
77
- }
78
- for (const item of stateGloas.builderPendingPayments.getAllReadonly()) {
79
- if (item.withdrawal.builderIndex === validatorIndex) {
80
- total += item.withdrawal.amount;
81
- }
82
- }
83
- }
84
94
  return total;
85
95
  }
86
96
  //# sourceMappingURL=validator.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/util/validator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/util/validator.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -11,7 +11,7 @@
11
11
  "bugs": {
12
12
  "url": "https://github.com/ChainSafe/lodestar/issues"
13
13
  },
14
- "version": "1.40.0-dev.3be9500fa9",
14
+ "version": "1.40.0-dev.45b04262dc",
15
15
  "type": "module",
16
16
  "exports": {
17
17
  ".": {
@@ -62,14 +62,14 @@
62
62
  "@chainsafe/pubkey-index-map": "^3.0.0",
63
63
  "@chainsafe/ssz": "^1.2.2",
64
64
  "@chainsafe/swap-or-not-shuffle": "^1.2.1",
65
- "@lodestar/config": "^1.40.0-dev.3be9500fa9",
66
- "@lodestar/params": "^1.40.0-dev.3be9500fa9",
67
- "@lodestar/types": "^1.40.0-dev.3be9500fa9",
68
- "@lodestar/utils": "^1.40.0-dev.3be9500fa9",
69
- "bigint-buffer": "^1.1.5"
65
+ "@lodestar/config": "^1.40.0-dev.45b04262dc",
66
+ "@lodestar/params": "^1.40.0-dev.45b04262dc",
67
+ "@lodestar/types": "^1.40.0-dev.45b04262dc",
68
+ "@lodestar/utils": "^1.40.0-dev.45b04262dc",
69
+ "@vekexasia/bigint-buffer2": "^1.1.0"
70
70
  },
71
71
  "devDependencies": {
72
- "@lodestar/api": "^1.40.0-dev.3be9500fa9"
72
+ "@lodestar/api": "^1.40.0-dev.45b04262dc"
73
73
  },
74
74
  "keywords": [
75
75
  "ethereum",
@@ -77,5 +77,5 @@
77
77
  "beacon",
78
78
  "blockchain"
79
79
  ],
80
- "gitHead": "aa021688bba9f3c5ff335ebb8c6b4dd3ead67f88"
80
+ "gitHead": "16ca9e68ec3a7ce41eb4d873802d5a08c6269f4d"
81
81
  }