@lodestar/state-transition 1.39.0-dev.3bf4734ba9 → 1.39.0-dev.84b481ddb5
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.
- package/lib/block/index.d.ts.map +1 -1
- package/lib/block/index.js +4 -2
- package/lib/block/index.js.map +1 -1
- package/lib/block/isValidIndexedAttestation.d.ts +3 -2
- package/lib/block/isValidIndexedAttestation.d.ts.map +1 -1
- package/lib/block/isValidIndexedAttestation.js +4 -4
- package/lib/block/isValidIndexedAttestation.js.map +1 -1
- package/lib/block/processAttestationPhase0.d.ts.map +1 -1
- package/lib/block/processAttestationPhase0.js +1 -1
- package/lib/block/processAttestationPhase0.js.map +1 -1
- package/lib/block/processAttestationsAltair.d.ts.map +1 -1
- package/lib/block/processAttestationsAltair.js +1 -1
- package/lib/block/processAttestationsAltair.js.map +1 -1
- package/lib/block/processAttesterSlashing.js +1 -1
- package/lib/block/processAttesterSlashing.js.map +1 -1
- package/lib/block/processExecutionPayload.d.ts.map +1 -1
- package/lib/block/processExecutionPayload.js +6 -4
- package/lib/block/processExecutionPayload.js.map +1 -1
- package/lib/block/processProposerSlashing.d.ts.map +1 -1
- package/lib/block/processProposerSlashing.js +1 -1
- package/lib/block/processProposerSlashing.js.map +1 -1
- package/lib/block/processRandao.js +1 -1
- package/lib/block/processRandao.js.map +1 -1
- package/lib/block/processSyncCommittee.d.ts +2 -1
- package/lib/block/processSyncCommittee.d.ts.map +1 -1
- package/lib/block/processSyncCommittee.js +3 -3
- package/lib/block/processSyncCommittee.js.map +1 -1
- package/lib/block/processVoluntaryExit.d.ts.map +1 -1
- package/lib/block/processVoluntaryExit.js +2 -1
- package/lib/block/processVoluntaryExit.js.map +1 -1
- package/lib/cache/epochCache.d.ts +0 -3
- package/lib/cache/epochCache.d.ts.map +1 -1
- package/lib/cache/epochCache.js +0 -3
- package/lib/cache/epochCache.js.map +1 -1
- package/lib/cache/stateCache.d.ts +1 -0
- package/lib/cache/stateCache.d.ts.map +1 -1
- package/lib/cache/stateCache.js.map +1 -1
- package/lib/signatureSets/attesterSlashings.d.ts +4 -3
- package/lib/signatureSets/attesterSlashings.d.ts.map +1 -1
- package/lib/signatureSets/attesterSlashings.js +6 -6
- package/lib/signatureSets/attesterSlashings.js.map +1 -1
- package/lib/signatureSets/index.d.ts +2 -1
- package/lib/signatureSets/index.d.ts.map +1 -1
- package/lib/signatureSets/index.js +8 -8
- package/lib/signatureSets/index.js.map +1 -1
- package/lib/signatureSets/indexedAttestation.d.ts +5 -4
- package/lib/signatureSets/indexedAttestation.d.ts.map +1 -1
- package/lib/signatureSets/indexedAttestation.js +8 -8
- package/lib/signatureSets/indexedAttestation.js.map +1 -1
- package/lib/signatureSets/proposer.d.ts +3 -2
- package/lib/signatureSets/proposer.d.ts.map +1 -1
- package/lib/signatureSets/proposer.js +3 -4
- package/lib/signatureSets/proposer.js.map +1 -1
- package/lib/signatureSets/proposerSlashings.d.ts +3 -2
- package/lib/signatureSets/proposerSlashings.d.ts.map +1 -1
- package/lib/signatureSets/proposerSlashings.js +4 -4
- package/lib/signatureSets/proposerSlashings.js.map +1 -1
- package/lib/signatureSets/randao.d.ts +3 -2
- package/lib/signatureSets/randao.d.ts.map +1 -1
- package/lib/signatureSets/randao.js +4 -4
- package/lib/signatureSets/randao.js.map +1 -1
- package/lib/signatureSets/voluntaryExits.d.ts +4 -3
- package/lib/signatureSets/voluntaryExits.d.ts.map +1 -1
- package/lib/signatureSets/voluntaryExits.js +6 -6
- package/lib/signatureSets/voluntaryExits.js.map +1 -1
- package/lib/stateTransition.d.ts.map +1 -1
- package/lib/stateTransition.js +2 -1
- package/lib/stateTransition.js.map +1 -1
- package/lib/util/execution.d.ts +11 -1
- package/lib/util/execution.d.ts.map +1 -1
- package/lib/util/execution.js +26 -1
- package/lib/util/execution.js.map +1 -1
- package/package.json +6 -6
- package/src/block/index.ts +6 -2
- package/src/block/isValidIndexedAttestation.ts +5 -2
- package/src/block/processAttestationPhase0.ts +1 -0
- package/src/block/processAttestationsAltair.ts +7 -1
- package/src/block/processAttesterSlashing.ts +1 -1
- package/src/block/processExecutionPayload.ts +14 -8
- package/src/block/processProposerSlashing.ts +6 -1
- package/src/block/processRandao.ts +1 -1
- package/src/block/processSyncCommittee.ts +10 -2
- package/src/block/processVoluntaryExit.ts +4 -1
- package/src/cache/epochCache.ts +0 -3
- package/src/cache/stateCache.ts +1 -0
- package/src/signatureSets/attesterSlashings.ts +7 -3
- package/src/signatureSets/index.ts +9 -6
- package/src/signatureSets/indexedAttestation.ts +9 -3
- package/src/signatureSets/proposer.ts +4 -2
- package/src/signatureSets/proposerSlashings.ts +5 -6
- package/src/signatureSets/randao.ts +5 -2
- package/src/signatureSets/voluntaryExits.ts +7 -3
- package/src/stateTransition.ts +4 -1
- package/src/util/execution.ts +39 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stateTransition.d.ts","sourceRoot":"","sources":["../src/stateTransition.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,IAAI,EAAM,MAAM,iBAAiB,CAAC;AAE9F,OAAO,EAAC,iBAAiB,EAAiD,MAAM,yBAAyB,CAAC;AAE1G,OAAO,EAAC,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAuB,wBAAwB,EAAqB,MAAM,iCAAiC,CAAC;AAEnH,OAAO,EAAC,4BAA4B,EAA0C,MAAM,cAAc,CAAC;AAYnG,OAAO,EACL,yBAAyB,EAQ1B,MAAM,YAAY,CAAC;AAMpB,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,GACjD,wBAAwB,GACxB,gBAAgB,GAAG;IACjB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEJ,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,CAAC,EAAE,4BAA4B,GAAG,IAAI,CAAC;IAC9C,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;CAC5C,CAAC;AAEF,UAAU,gBAAgB;IACxB,yBAAyB,CACvB,YAAY,EAAE,KAAK,EACnB,eAAe,EAAE,MAAM,EAAE,EACzB,KAAK,EAAE,MAAM,EAAE,EACf,iBAAiB,EAAE,OAAO,EAAE,EAC5B,iBAAiB,EAAE,OAAO,EAAE,EAC5B,QAAQ,CAAC,EAAE,MAAM,EAAE,GAClB,IAAI,CAAC;CACT;AAED;;GAEG;AACH,oBAAY,gBAAgB;IAC1B,eAAe,oBAAoB;IACnC,YAAY,iBAAiB;CAC9B;AAED;;GAEG;AACH,oBAAY,uBAAuB;IACjC,eAAe,qBAAqB;IACpC,eAAe,qBAAqB;IACpC,eAAe,sBAAsB;IACrC,gBAAgB,uBAAuB;IACvC,UAAU,gBAAgB;IAC1B,mBAAmB,2BAA2B;CAC/C;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,yBAAyB,EAChC,WAAW,EAAE,iBAAiB,GAAG,wBAAwB,EACzD,OAAO,GAAE,mBAIR,EACD,EAAC,OAAO,EAAE,gBAAgB,EAAC,GAAE,sBAA2B,GACvD,yBAAyB,
|
|
1
|
+
{"version":3,"file":"stateTransition.d.ts","sourceRoot":"","sources":["../src/stateTransition.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,IAAI,EAAM,MAAM,iBAAiB,CAAC;AAE9F,OAAO,EAAC,iBAAiB,EAAiD,MAAM,yBAAyB,CAAC;AAE1G,OAAO,EAAC,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAuB,wBAAwB,EAAqB,MAAM,iCAAiC,CAAC;AAEnH,OAAO,EAAC,4BAA4B,EAA0C,MAAM,cAAc,CAAC;AAYnG,OAAO,EACL,yBAAyB,EAQ1B,MAAM,YAAY,CAAC;AAMpB,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,GACjD,wBAAwB,GACxB,gBAAgB,GAAG;IACjB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEJ,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,CAAC,EAAE,4BAA4B,GAAG,IAAI,CAAC;IAC9C,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;CAC5C,CAAC;AAEF,UAAU,gBAAgB;IACxB,yBAAyB,CACvB,YAAY,EAAE,KAAK,EACnB,eAAe,EAAE,MAAM,EAAE,EACzB,KAAK,EAAE,MAAM,EAAE,EACf,iBAAiB,EAAE,OAAO,EAAE,EAC5B,iBAAiB,EAAE,OAAO,EAAE,EAC5B,QAAQ,CAAC,EAAE,MAAM,EAAE,GAClB,IAAI,CAAC;CACT;AAED;;GAEG;AACH,oBAAY,gBAAgB;IAC1B,eAAe,oBAAoB;IACnC,YAAY,iBAAiB;CAC9B;AAED;;GAEG;AACH,oBAAY,uBAAuB;IACjC,eAAe,qBAAqB;IACpC,eAAe,qBAAqB;IACpC,eAAe,sBAAsB;IACrC,gBAAgB,uBAAuB;IACvC,UAAU,gBAAgB;IAC1B,mBAAmB,2BAA2B;CAC/C;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,yBAAyB,EAChC,WAAW,EAAE,iBAAiB,GAAG,wBAAwB,EACzD,OAAO,GAAE,mBAIR,EACD,EAAC,OAAO,EAAE,gBAAgB,EAAC,GAAE,sBAA2B,GACvD,yBAAyB,CAiE3B;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,yBAAyB,EAChC,IAAI,EAAE,IAAI,EACV,wBAAwB,CAAC,EAAE,wBAAwB,GAAG;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAC,EACnF,EAAC,OAAO,EAAE,gBAAgB,EAAC,GAAE,sBAA2B,GACvD,yBAAyB,CAiB3B"}
|
package/lib/stateTransition.js
CHANGED
|
@@ -52,7 +52,8 @@ export function stateTransition(state, signedBlock, options = {
|
|
|
52
52
|
// Includes state upgrades
|
|
53
53
|
postState = processSlotsWithTransientCache(postState, blockSlot, options, { metrics, validatorMonitor });
|
|
54
54
|
// Verify proposer signature only
|
|
55
|
-
if (verifyProposer &&
|
|
55
|
+
if (verifyProposer &&
|
|
56
|
+
!verifyProposerSignature(postState.config, postState.epochCtx.index2pubkey, postState, signedBlock)) {
|
|
56
57
|
throw new Error("Invalid block signature");
|
|
57
58
|
}
|
|
58
59
|
// Process block
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stateTransition.js","sourceRoot":"","sources":["../src/stateTransition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAA2D,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAoB,sBAAsB,EAAE,sBAAsB,EAAC,MAAM,yBAAyB,CAAC;AAC1G,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAiD,kBAAkB,EAAC,MAAM,iCAAiC,CAAC;AACnH,OAAO,EAAC,mBAAmB,EAAE,YAAY,EAAC,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAA+B,kBAAkB,EAAE,mBAAmB,EAAC,MAAM,cAAc,CAAC;AACnG,OAAO,EAAC,uBAAuB,EAAC,MAAM,0BAA0B,CAAC;AACjE,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,uBAAuB,EACvB,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,kBAAkB,EAAC,MAAM,8BAA8B,CAAC;AAWhE,OAAO,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AA8BnD;;GAEG;AACH,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,uDAAmC,CAAA;IACnC,iDAA6B,CAAA;AAC/B,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,uBAOX;AAPD,WAAY,uBAAuB;IACjC,+DAAoC,CAAA;IACpC,+DAAoC,CAAA;IACpC,gEAAqC,CAAA;IACrC,kEAAuC,CAAA;IACvC,qDAA0B,CAAA;IAC1B,yEAA8C,CAAA;AAChD,CAAC,EAPW,uBAAuB,KAAvB,uBAAuB,QAOlC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAC7B,KAAgC,EAChC,WAAyD,EACzD,UAA+B;IAC7B,2CAA2C;IAC3C,sBAAsB,EAAE,sBAAsB,CAAC,KAAK;IACpD,sBAAsB,EAAE,sBAAsB,CAAC,SAAS;CACzD,EACD,EAAC,OAAO,EAAE,gBAAgB,KAA4B,EAAE;IAExD,MAAM,EAAC,eAAe,GAAG,IAAI,EAAE,cAAc,GAAG,IAAI,EAAC,GAAG,OAAO,CAAC;IAEhE,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC;IAClC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;IAE7B,qDAAqD;IACrD,IAAI,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEvD,IAAI,OAAO,EAAE,CAAC;QACZ,mBAAmB,CAAC,SAAS,EAAE,OAAO,EAAE,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAC5E,CAAC;IAED,oGAAoG;IACpG,yCAAyC;IAEzC,8DAA8D;IAC9D,0BAA0B;IAC1B,SAAS,GAAG,8BAA8B,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,EAAC,OAAO,EAAE,gBAAgB,EAAC,CAAC,CAAC;IAEvG,iCAAiC;IACjC,
|
|
1
|
+
{"version":3,"file":"stateTransition.js","sourceRoot":"","sources":["../src/stateTransition.ts"],"names":[],"mappings":"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"}
|
package/lib/util/execution.d.ts
CHANGED
|
@@ -1,6 +1,16 @@
|
|
|
1
1
|
import { ForkName, ForkPostBellatrix, ForkPreGloas, ForkSeq } from "@lodestar/params";
|
|
2
|
-
import { BeaconBlock, BeaconBlockBody, BlindedBeaconBlockBody, ExecutionPayload, ExecutionPayloadHeader, capella } from "@lodestar/types";
|
|
2
|
+
import { BeaconBlock, BeaconBlockBody, BlindedBeaconBlock, BlindedBeaconBlockBody, ExecutionPayload, ExecutionPayloadHeader, capella } from "@lodestar/types";
|
|
3
3
|
import { BeaconStateAllForks, BeaconStateCapella, BeaconStateExecutions, CachedBeaconStateAllForks, CachedBeaconStateExecutions } from "../types.js";
|
|
4
|
+
/**
|
|
5
|
+
* Execution enabled = merge is done.
|
|
6
|
+
* When (A) state has execution data OR (B) block has execution data
|
|
7
|
+
*/
|
|
8
|
+
export declare function isExecutionEnabled(state: BeaconStateExecutions, block: BeaconBlock | BlindedBeaconBlock): boolean;
|
|
9
|
+
/**
|
|
10
|
+
* Merge is complete when the state includes execution layer data:
|
|
11
|
+
* state.latestExecutionPayloadHeader NOT EMPTY or state is post-capella
|
|
12
|
+
*/
|
|
13
|
+
export declare function isMergeTransitionComplete(state: BeaconStateExecutions): boolean;
|
|
4
14
|
/** Type guard for bellatrix.BeaconState */
|
|
5
15
|
export declare function isExecutionStateType(state: BeaconStateAllForks): state is BeaconStateExecutions;
|
|
6
16
|
/** Type guard for capella.BeaconState */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/util/execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,iBAAiB,EAAE,YAAY,EAAE,OAAO,EAAC,MAAM,kBAAkB,CAAC;AACpF,OAAO,EACL,WAAW,EACX,eAAe,EACf,sBAAsB,EACtB,gBAAgB,EAChB,sBAAsB,EAEtB,OAAO,
|
|
1
|
+
{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/util/execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,iBAAiB,EAAE,YAAY,EAAE,OAAO,EAAC,MAAM,kBAAkB,CAAC;AACpF,OAAO,EACL,WAAW,EACX,eAAe,EACf,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB,EAChB,sBAAsB,EAEtB,OAAO,EAKR,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,qBAAqB,EACrB,yBAAyB,EACzB,2BAA2B,EAC5B,MAAM,aAAa,CAAC;AAErB;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,qBAAqB,EAAE,KAAK,EAAE,WAAW,GAAG,kBAAkB,GAAG,OAAO,CAcjH;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAU/E;AAED,2CAA2C;AAC3C,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,mBAAmB,GAAG,KAAK,IAAI,qBAAqB,CAE/F;AAED,yCAAyC;AACzC,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,mBAAmB,GAAG,KAAK,IAAI,kBAAkB,CAK1F;AAED,iDAAiD;AACjD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,yBAAyB,GAAG,KAAK,IAAI,2BAA2B,CAEjH;AAED,wCAAwC;AACxC,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,eAAe,GACzB,SAAS,IAAI,eAAe,CAAC,iBAAiB,GAAG,YAAY,CAAC,CAEhE;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,gBAAgB,GAAG,sBAAsB,CAErG;AAED,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,eAAe,GAAG,sBAAsB,GAC7C,gBAAgB,GAAG,sBAAsB,CAU3C;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,gBAAgB,GAAG,sBAAsB,GACjD,OAAO,IAAI,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAK1F;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,OAAO,CAAC,6BAA6B,GAC7C,OAAO,IAAI,OAAO,CAAC,sBAAsB,CAE3C;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,gBAAgB,GAAG,sBAAsB,CAuChH"}
|
package/lib/util/execution.js
CHANGED
|
@@ -1,5 +1,30 @@
|
|
|
1
1
|
import { ForkSeq } from "@lodestar/params";
|
|
2
|
-
import { isBlindedBeaconBlockBody, ssz, } from "@lodestar/types";
|
|
2
|
+
import { isBlindedBeaconBlockBody, isExecutionPayload, ssz, } from "@lodestar/types";
|
|
3
|
+
/**
|
|
4
|
+
* Execution enabled = merge is done.
|
|
5
|
+
* When (A) state has execution data OR (B) block has execution data
|
|
6
|
+
*/
|
|
7
|
+
export function isExecutionEnabled(state, block) {
|
|
8
|
+
if (isMergeTransitionComplete(state)) {
|
|
9
|
+
return true;
|
|
10
|
+
}
|
|
11
|
+
// Throws if not post-bellatrix block. A fork-guard before isExecutionEnabled() prevents this from happening
|
|
12
|
+
const payload = getFullOrBlindedPayload(block);
|
|
13
|
+
return isExecutionPayload(payload)
|
|
14
|
+
? !ssz.bellatrix.ExecutionPayload.equals(payload, ssz.bellatrix.ExecutionPayload.defaultValue())
|
|
15
|
+
: !ssz.bellatrix.ExecutionPayloadHeader.equals(state.latestExecutionPayloadHeader, ssz.bellatrix.ExecutionPayloadHeader.defaultValue());
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Merge is complete when the state includes execution layer data:
|
|
19
|
+
* state.latestExecutionPayloadHeader NOT EMPTY or state is post-capella
|
|
20
|
+
*/
|
|
21
|
+
export function isMergeTransitionComplete(state) {
|
|
22
|
+
if (isCapellaStateType(state)) {
|
|
23
|
+
// All networks have completed the merge transition before capella
|
|
24
|
+
return true;
|
|
25
|
+
}
|
|
26
|
+
return !ssz.bellatrix.ExecutionPayloadHeader.equals(state.latestExecutionPayloadHeader, ssz.bellatrix.ExecutionPayloadHeader.defaultValue());
|
|
27
|
+
}
|
|
3
28
|
/** Type guard for bellatrix.BeaconState */
|
|
4
29
|
export function isExecutionStateType(state) {
|
|
5
30
|
return state.latestExecutionPayloadHeader !== undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution.js","sourceRoot":"","sources":["../../src/util/execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,OAAO,EAAC,MAAM,kBAAkB,CAAC;AACpF,OAAO,
|
|
1
|
+
{"version":3,"file":"execution.js","sourceRoot":"","sources":["../../src/util/execution.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.39.0-dev.
|
|
14
|
+
"version": "1.39.0-dev.84b481ddb5",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -62,10 +62,10 @@
|
|
|
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.39.0-dev.
|
|
66
|
-
"@lodestar/params": "1.39.0-dev.
|
|
67
|
-
"@lodestar/types": "1.39.0-dev.
|
|
68
|
-
"@lodestar/utils": "1.39.0-dev.
|
|
65
|
+
"@lodestar/config": "1.39.0-dev.84b481ddb5",
|
|
66
|
+
"@lodestar/params": "1.39.0-dev.84b481ddb5",
|
|
67
|
+
"@lodestar/types": "1.39.0-dev.84b481ddb5",
|
|
68
|
+
"@lodestar/utils": "1.39.0-dev.84b481ddb5",
|
|
69
69
|
"bigint-buffer": "^1.1.5"
|
|
70
70
|
},
|
|
71
71
|
"keywords": [
|
|
@@ -74,5 +74,5 @@
|
|
|
74
74
|
"beacon",
|
|
75
75
|
"blockchain"
|
|
76
76
|
],
|
|
77
|
-
"gitHead": "
|
|
77
|
+
"gitHead": "599e196bc2c645e3eaf5696afc9e262f63f5736f"
|
|
78
78
|
}
|
package/src/block/index.ts
CHANGED
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
CachedBeaconStateCapella,
|
|
8
8
|
CachedBeaconStateGloas,
|
|
9
9
|
} from "../types.js";
|
|
10
|
-
import {getFullOrBlindedPayload} from "../util/execution.js";
|
|
10
|
+
import {getFullOrBlindedPayload, isExecutionEnabled} from "../util/execution.js";
|
|
11
11
|
import {BlockExternalData, DataAvailabilityStatus} from "./externalData.js";
|
|
12
12
|
import {processBlobKzgCommitments} from "./processBlobKzgCommitments.js";
|
|
13
13
|
import {processBlockHeader} from "./processBlockHeader.js";
|
|
@@ -67,7 +67,11 @@ export function processBlock(
|
|
|
67
67
|
// The call to the process_execution_payload must happen before the call to the process_randao as the former depends
|
|
68
68
|
// on the randao_mix computed with the reveal of the previous block.
|
|
69
69
|
// TODO GLOAS: We call processExecutionPayload somewhere else post-gloas
|
|
70
|
-
if (
|
|
70
|
+
if (
|
|
71
|
+
fork < ForkSeq.gloas &&
|
|
72
|
+
fork >= ForkSeq.bellatrix &&
|
|
73
|
+
isExecutionEnabled(state as CachedBeaconStateBellatrix, block)
|
|
74
|
+
) {
|
|
71
75
|
processExecutionPayload(fork, state as CachedBeaconStateBellatrix, block.body, externalData);
|
|
72
76
|
}
|
|
73
77
|
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import {BeaconConfig} from "@lodestar/config";
|
|
1
2
|
import {ForkSeq, MAX_COMMITTEES_PER_SLOT, MAX_VALIDATORS_PER_COMMITTEE} from "@lodestar/params";
|
|
2
3
|
import {IndexedAttestation, IndexedAttestationBigint} from "@lodestar/types";
|
|
3
4
|
import {Index2PubkeyCache} from "../cache/pubkeyCache.js";
|
|
@@ -9,6 +10,7 @@ import {verifySignatureSet} from "../util/index.js";
|
|
|
9
10
|
* Check if `indexedAttestation` has sorted and unique indices and a valid aggregate signature.
|
|
10
11
|
*/
|
|
11
12
|
export function isValidIndexedAttestation(
|
|
13
|
+
config: BeaconConfig,
|
|
12
14
|
index2pubkey: Index2PubkeyCache,
|
|
13
15
|
state: CachedBeaconStateAllForks,
|
|
14
16
|
indexedAttestation: IndexedAttestation,
|
|
@@ -19,12 +21,13 @@ export function isValidIndexedAttestation(
|
|
|
19
21
|
}
|
|
20
22
|
|
|
21
23
|
if (verifySignature) {
|
|
22
|
-
return verifySignatureSet(getIndexedAttestationSignatureSet(index2pubkey, state, indexedAttestation));
|
|
24
|
+
return verifySignatureSet(getIndexedAttestationSignatureSet(config, index2pubkey, state, indexedAttestation));
|
|
23
25
|
}
|
|
24
26
|
return true;
|
|
25
27
|
}
|
|
26
28
|
|
|
27
29
|
export function isValidIndexedAttestationBigint(
|
|
30
|
+
config: BeaconConfig,
|
|
28
31
|
index2pubkey: Index2PubkeyCache,
|
|
29
32
|
state: CachedBeaconStateAllForks,
|
|
30
33
|
indexedAttestation: IndexedAttestationBigint,
|
|
@@ -35,7 +38,7 @@ export function isValidIndexedAttestationBigint(
|
|
|
35
38
|
}
|
|
36
39
|
|
|
37
40
|
if (verifySignature) {
|
|
38
|
-
return verifySignatureSet(getIndexedAttestationBigintSignatureSet(index2pubkey, state, indexedAttestation));
|
|
41
|
+
return verifySignatureSet(getIndexedAttestationBigintSignatureSet(config, index2pubkey, state, indexedAttestation));
|
|
39
42
|
}
|
|
40
43
|
return true;
|
|
41
44
|
}
|
|
@@ -64,7 +64,13 @@ export function processAttestationsAltair(
|
|
|
64
64
|
// TODO: Why should we verify an indexed attestation that we just created? If it's just for the signature
|
|
65
65
|
// we can verify only that and nothing else.
|
|
66
66
|
if (verifySignature) {
|
|
67
|
-
const sigSet = getAttestationWithIndicesSignatureSet(
|
|
67
|
+
const sigSet = getAttestationWithIndicesSignatureSet(
|
|
68
|
+
state.config,
|
|
69
|
+
epochCtx.index2pubkey,
|
|
70
|
+
state,
|
|
71
|
+
attestation,
|
|
72
|
+
attestingIndices
|
|
73
|
+
);
|
|
68
74
|
if (!verifySignatureSet(sigSet)) {
|
|
69
75
|
throw new Error("Attestation signature is not valid");
|
|
70
76
|
}
|
|
@@ -55,7 +55,7 @@ export function assertValidAttesterSlashing(
|
|
|
55
55
|
// be higher than the clock and the slashing would still be valid. Same applies to attestation data index, which
|
|
56
56
|
// can be any arbitrary value. Must use bigint variants to hash correctly to all possible values
|
|
57
57
|
for (const [i, attestation] of [attestation1, attestation2].entries()) {
|
|
58
|
-
if (!isValidIndexedAttestationBigint(index2pubkey, state, attestation, verifySignatures)) {
|
|
58
|
+
if (!isValidIndexedAttestationBigint(state.config, index2pubkey, state, attestation, verifySignatures)) {
|
|
59
59
|
throw new Error(`AttesterSlashing attestation${i} is invalid`);
|
|
60
60
|
}
|
|
61
61
|
}
|
|
@@ -3,7 +3,11 @@ import {ForkName, ForkSeq, isForkPostDeneb} from "@lodestar/params";
|
|
|
3
3
|
import {BeaconBlockBody, BlindedBeaconBlockBody, deneb, isExecutionPayload} from "@lodestar/types";
|
|
4
4
|
import {toHex, toRootHex} from "@lodestar/utils";
|
|
5
5
|
import {CachedBeaconStateBellatrix, CachedBeaconStateCapella} from "../types.js";
|
|
6
|
-
import {
|
|
6
|
+
import {
|
|
7
|
+
executionPayloadToPayloadHeader,
|
|
8
|
+
getFullOrBlindedPayloadFromBody,
|
|
9
|
+
isMergeTransitionComplete,
|
|
10
|
+
} from "../util/execution.js";
|
|
7
11
|
import {computeEpochAtSlot, computeTimeAtSlot, getRandaoMix} from "../util/index.js";
|
|
8
12
|
import {BlockExternalData, ExecutionPayloadStatus} from "./externalData.js";
|
|
9
13
|
|
|
@@ -17,13 +21,15 @@ export function processExecutionPayload(
|
|
|
17
21
|
const forkName = ForkName[ForkSeq[fork] as ForkName];
|
|
18
22
|
// Verify consistency of the parent hash, block number, base fee per gas and gas limit
|
|
19
23
|
// with respect to the previous execution payload header
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
24
|
+
if (isMergeTransitionComplete(state)) {
|
|
25
|
+
const {latestExecutionPayloadHeader} = state;
|
|
26
|
+
if (!byteArrayEquals(payload.parentHash, latestExecutionPayloadHeader.blockHash)) {
|
|
27
|
+
throw Error(
|
|
28
|
+
`Invalid execution payload parentHash ${toRootHex(payload.parentHash)} latest blockHash ${toRootHex(
|
|
29
|
+
latestExecutionPayloadHeader.blockHash
|
|
30
|
+
)}`
|
|
31
|
+
);
|
|
32
|
+
}
|
|
27
33
|
}
|
|
28
34
|
|
|
29
35
|
// Verify random
|
|
@@ -77,7 +77,12 @@ export function assertValidProposerSlashing(
|
|
|
77
77
|
|
|
78
78
|
// verify signatures
|
|
79
79
|
if (verifySignatures) {
|
|
80
|
-
const signatureSets = getProposerSlashingSignatureSets(
|
|
80
|
+
const signatureSets = getProposerSlashingSignatureSets(
|
|
81
|
+
state.config,
|
|
82
|
+
state.epochCtx.index2pubkey,
|
|
83
|
+
state,
|
|
84
|
+
proposerSlashing
|
|
85
|
+
);
|
|
81
86
|
for (let i = 0; i < signatureSets.length; i++) {
|
|
82
87
|
if (!verifySignatureSet(signatureSets[i])) {
|
|
83
88
|
throw new Error(`ProposerSlashing header${i + 1} signature invalid`);
|
|
@@ -17,7 +17,7 @@ export function processRandao(state: CachedBeaconStateAllForks, block: BeaconBlo
|
|
|
17
17
|
const randaoReveal = block.body.randaoReveal;
|
|
18
18
|
|
|
19
19
|
// verify RANDAO reveal
|
|
20
|
-
if (verifySignature && !verifyRandaoSignature(epochCtx.index2pubkey, state, block)) {
|
|
20
|
+
if (verifySignature && !verifyRandaoSignature(state.config, epochCtx.index2pubkey, state, block)) {
|
|
21
21
|
throw new Error("RANDAO reveal is an invalid signature");
|
|
22
22
|
}
|
|
23
23
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import {byteArrayEquals} from "@chainsafe/ssz";
|
|
2
|
+
import {BeaconConfig} from "@lodestar/config";
|
|
2
3
|
import {DOMAIN_SYNC_COMMITTEE, SYNC_COMMITTEE_SIZE} from "@lodestar/params";
|
|
3
4
|
import {altair, ssz} from "@lodestar/types";
|
|
4
5
|
import {Index2PubkeyCache} from "../cache/pubkeyCache.js";
|
|
@@ -24,7 +25,13 @@ export function processSyncAggregate(
|
|
|
24
25
|
if (verifySignatures) {
|
|
25
26
|
// This is to conform to the spec - we want the signature to be verified
|
|
26
27
|
const participantIndices = block.body.syncAggregate.syncCommitteeBits.intersectValues(committeeIndices);
|
|
27
|
-
const signatureSet = getSyncCommitteeSignatureSet(
|
|
28
|
+
const signatureSet = getSyncCommitteeSignatureSet(
|
|
29
|
+
state.config,
|
|
30
|
+
state.epochCtx.index2pubkey,
|
|
31
|
+
state,
|
|
32
|
+
block,
|
|
33
|
+
participantIndices
|
|
34
|
+
);
|
|
28
35
|
// When there's no participation we consider the signature valid and just ignore i
|
|
29
36
|
if (signatureSet !== null && !verifySignatureSet(signatureSet)) {
|
|
30
37
|
throw Error("Sync committee signature invalid");
|
|
@@ -64,6 +71,7 @@ export function processSyncAggregate(
|
|
|
64
71
|
}
|
|
65
72
|
|
|
66
73
|
export function getSyncCommitteeSignatureSet(
|
|
74
|
+
config: BeaconConfig,
|
|
67
75
|
index2pubkey: Index2PubkeyCache,
|
|
68
76
|
state: CachedBeaconStateAllForks,
|
|
69
77
|
block: altair.BeaconBlock,
|
|
@@ -107,7 +115,7 @@ export function getSyncCommitteeSignatureSet(
|
|
|
107
115
|
throw Error("Empty sync committee signature is not infinity");
|
|
108
116
|
}
|
|
109
117
|
|
|
110
|
-
const domain =
|
|
118
|
+
const domain = config.getDomain(state.slot, DOMAIN_SYNC_COMMITTEE, previousSlot);
|
|
111
119
|
|
|
112
120
|
return {
|
|
113
121
|
type: SignatureSetType.aggregate,
|
|
@@ -74,7 +74,10 @@ export function getVoluntaryExitValidity(
|
|
|
74
74
|
return VoluntaryExitValidity.pendingWithdrawals;
|
|
75
75
|
}
|
|
76
76
|
|
|
77
|
-
if (
|
|
77
|
+
if (
|
|
78
|
+
verifySignature &&
|
|
79
|
+
!verifyVoluntaryExitSignature(state.config, epochCtx.index2pubkey, state, signedVoluntaryExit)
|
|
80
|
+
) {
|
|
78
81
|
return VoluntaryExitValidity.invalidSignature;
|
|
79
82
|
}
|
|
80
83
|
|
package/src/cache/epochCache.ts
CHANGED
|
@@ -108,9 +108,6 @@ export class EpochCache {
|
|
|
108
108
|
/**
|
|
109
109
|
* Unique globally shared pubkey registry. There should only exist one for the entire application.
|
|
110
110
|
*
|
|
111
|
-
* TODO: this is a hack, we need a safety mechanism in case a bad eth1 majority vote is in,
|
|
112
|
-
* or handle non finalized data differently, or use an immutable.js structure for cheap copies
|
|
113
|
-
*
|
|
114
111
|
* $VALIDATOR_COUNT x 192 char String -> Number Map
|
|
115
112
|
*/
|
|
116
113
|
pubkey2index: PubkeyIndexMap;
|
package/src/cache/stateCache.ts
CHANGED
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
} from "./types.js";
|
|
18
18
|
|
|
19
19
|
export type BeaconStateCache = {
|
|
20
|
+
/** @deprecated should not access config outside of state-transition package */
|
|
20
21
|
config: BeaconConfig;
|
|
21
22
|
epochCtx: EpochCache;
|
|
22
23
|
/** Count of clones created from this BeaconStateCache instance. readonly to prevent accidental usage downstream */
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import {BeaconConfig} from "@lodestar/config";
|
|
1
2
|
import {DOMAIN_BEACON_ATTESTER} from "@lodestar/params";
|
|
2
3
|
import {AttesterSlashing, IndexedAttestationBigint, SignedBeaconBlock, ssz} from "@lodestar/types";
|
|
3
4
|
import {Index2PubkeyCache} from "../cache/pubkeyCache.js";
|
|
@@ -6,33 +7,36 @@ import {ISignatureSet, SignatureSetType, computeSigningRoot, computeStartSlotAtE
|
|
|
6
7
|
|
|
7
8
|
/** Get signature sets from all AttesterSlashing objects in a block */
|
|
8
9
|
export function getAttesterSlashingsSignatureSets(
|
|
10
|
+
config: BeaconConfig,
|
|
9
11
|
index2pubkey: Index2PubkeyCache,
|
|
10
12
|
state: CachedBeaconStateAllForks,
|
|
11
13
|
signedBlock: SignedBeaconBlock
|
|
12
14
|
): ISignatureSet[] {
|
|
13
15
|
return signedBlock.message.body.attesterSlashings.flatMap((attesterSlashing) =>
|
|
14
|
-
getAttesterSlashingSignatureSets(index2pubkey, state, attesterSlashing)
|
|
16
|
+
getAttesterSlashingSignatureSets(config, index2pubkey, state, attesterSlashing)
|
|
15
17
|
);
|
|
16
18
|
}
|
|
17
19
|
|
|
18
20
|
/** Get signature sets from a single AttesterSlashing object */
|
|
19
21
|
export function getAttesterSlashingSignatureSets(
|
|
22
|
+
config: BeaconConfig,
|
|
20
23
|
index2pubkey: Index2PubkeyCache,
|
|
21
24
|
state: CachedBeaconStateAllForks,
|
|
22
25
|
attesterSlashing: AttesterSlashing
|
|
23
26
|
): ISignatureSet[] {
|
|
24
27
|
return [attesterSlashing.attestation1, attesterSlashing.attestation2].map((attestation) =>
|
|
25
|
-
getIndexedAttestationBigintSignatureSet(index2pubkey, state, attestation)
|
|
28
|
+
getIndexedAttestationBigintSignatureSet(config, index2pubkey, state, attestation)
|
|
26
29
|
);
|
|
27
30
|
}
|
|
28
31
|
|
|
29
32
|
export function getIndexedAttestationBigintSignatureSet(
|
|
33
|
+
config: BeaconConfig,
|
|
30
34
|
index2pubkey: Index2PubkeyCache,
|
|
31
35
|
state: CachedBeaconStateAllForks,
|
|
32
36
|
indexedAttestation: IndexedAttestationBigint
|
|
33
37
|
): ISignatureSet {
|
|
34
38
|
const slot = computeStartSlotAtEpoch(Number(indexedAttestation.data.target.epoch as bigint));
|
|
35
|
-
const domain =
|
|
39
|
+
const domain = config.getDomain(state.slot, DOMAIN_BEACON_ATTESTER, slot);
|
|
36
40
|
|
|
37
41
|
return {
|
|
38
42
|
type: SignatureSetType.aggregate,
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import {BeaconConfig} from "@lodestar/config";
|
|
1
2
|
import {ForkSeq} from "@lodestar/params";
|
|
2
3
|
import {IndexedAttestation, SignedBeaconBlock, altair, capella} from "@lodestar/types";
|
|
3
4
|
import {getSyncCommitteeSignatureSet} from "../block/processSyncCommittee.js";
|
|
@@ -26,6 +27,7 @@ export * from "./voluntaryExits.js";
|
|
|
26
27
|
* Deposits are not included because they can legally have invalid signatures.
|
|
27
28
|
*/
|
|
28
29
|
export function getBlockSignatureSets(
|
|
30
|
+
config: BeaconConfig,
|
|
29
31
|
index2pubkey: Index2PubkeyCache,
|
|
30
32
|
state: CachedBeaconStateAllForks,
|
|
31
33
|
signedBlock: SignedBeaconBlock,
|
|
@@ -39,20 +41,21 @@ export function getBlockSignatureSets(
|
|
|
39
41
|
const fork = state.config.getForkSeq(signedBlock.message.slot);
|
|
40
42
|
|
|
41
43
|
const signatureSets = [
|
|
42
|
-
getRandaoRevealSignatureSet(index2pubkey, state, signedBlock.message),
|
|
43
|
-
...getProposerSlashingsSignatureSets(index2pubkey, state, signedBlock),
|
|
44
|
-
...getAttesterSlashingsSignatureSets(index2pubkey, state, signedBlock),
|
|
45
|
-
...getAttestationsSignatureSets(index2pubkey, state, signedBlock, indexedAttestations),
|
|
46
|
-
...getVoluntaryExitsSignatureSets(index2pubkey, state, signedBlock),
|
|
44
|
+
getRandaoRevealSignatureSet(config, index2pubkey, state, signedBlock.message),
|
|
45
|
+
...getProposerSlashingsSignatureSets(config, index2pubkey, state, signedBlock),
|
|
46
|
+
...getAttesterSlashingsSignatureSets(config, index2pubkey, state, signedBlock),
|
|
47
|
+
...getAttestationsSignatureSets(config, index2pubkey, state, signedBlock, indexedAttestations),
|
|
48
|
+
...getVoluntaryExitsSignatureSets(config, index2pubkey, state, signedBlock),
|
|
47
49
|
];
|
|
48
50
|
|
|
49
51
|
if (!opts?.skipProposerSignature) {
|
|
50
|
-
signatureSets.push(getBlockProposerSignatureSet(index2pubkey, state, signedBlock));
|
|
52
|
+
signatureSets.push(getBlockProposerSignatureSet(config, index2pubkey, state, signedBlock));
|
|
51
53
|
}
|
|
52
54
|
|
|
53
55
|
// Only after altair fork, validate tSyncCommitteeSignature
|
|
54
56
|
if (fork >= ForkSeq.altair) {
|
|
55
57
|
const syncCommitteeSignatureSet = getSyncCommitteeSignatureSet(
|
|
58
|
+
config,
|
|
56
59
|
index2pubkey,
|
|
57
60
|
state as CachedBeaconStateAltair,
|
|
58
61
|
(signedBlock as altair.SignedBeaconBlock).message
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import {BeaconConfig} from "@lodestar/config";
|
|
1
2
|
import {DOMAIN_BEACON_ATTESTER} from "@lodestar/params";
|
|
2
3
|
import {IndexedAttestation, SignedBeaconBlock, phase0, ssz} from "@lodestar/types";
|
|
3
4
|
import {Index2PubkeyCache} from "../cache/pubkeyCache.js";
|
|
@@ -10,16 +11,18 @@ import {
|
|
|
10
11
|
} from "../util/index.js";
|
|
11
12
|
|
|
12
13
|
export function getAttestationDataSigningRoot(
|
|
14
|
+
config: BeaconConfig,
|
|
13
15
|
state: CachedBeaconStateAllForks,
|
|
14
16
|
data: phase0.AttestationData
|
|
15
17
|
): Uint8Array {
|
|
16
18
|
const slot = computeStartSlotAtEpoch(data.target.epoch);
|
|
17
|
-
const domain =
|
|
19
|
+
const domain = config.getDomain(state.slot, DOMAIN_BEACON_ATTESTER, slot);
|
|
18
20
|
|
|
19
21
|
return computeSigningRoot(ssz.phase0.AttestationData, data, domain);
|
|
20
22
|
}
|
|
21
23
|
|
|
22
24
|
export function getAttestationWithIndicesSignatureSet(
|
|
25
|
+
config: BeaconConfig,
|
|
23
26
|
index2pubkey: Index2PubkeyCache,
|
|
24
27
|
state: CachedBeaconStateAllForks,
|
|
25
28
|
attestation: Pick<phase0.Attestation, "data" | "signature">,
|
|
@@ -27,17 +30,19 @@ export function getAttestationWithIndicesSignatureSet(
|
|
|
27
30
|
): ISignatureSet {
|
|
28
31
|
return createAggregateSignatureSetFromComponents(
|
|
29
32
|
attestingIndices.map((i) => index2pubkey[i]),
|
|
30
|
-
getAttestationDataSigningRoot(state, attestation.data),
|
|
33
|
+
getAttestationDataSigningRoot(config, state, attestation.data),
|
|
31
34
|
attestation.signature
|
|
32
35
|
);
|
|
33
36
|
}
|
|
34
37
|
|
|
35
38
|
export function getIndexedAttestationSignatureSet(
|
|
39
|
+
config: BeaconConfig,
|
|
36
40
|
index2pubkey: Index2PubkeyCache,
|
|
37
41
|
state: CachedBeaconStateAllForks,
|
|
38
42
|
indexedAttestation: IndexedAttestation
|
|
39
43
|
): ISignatureSet {
|
|
40
44
|
return getAttestationWithIndicesSignatureSet(
|
|
45
|
+
config,
|
|
41
46
|
index2pubkey,
|
|
42
47
|
state,
|
|
43
48
|
indexedAttestation,
|
|
@@ -46,6 +51,7 @@ export function getIndexedAttestationSignatureSet(
|
|
|
46
51
|
}
|
|
47
52
|
|
|
48
53
|
export function getAttestationsSignatureSets(
|
|
54
|
+
config: BeaconConfig,
|
|
49
55
|
index2pubkey: Index2PubkeyCache,
|
|
50
56
|
state: CachedBeaconStateAllForks,
|
|
51
57
|
signedBlock: SignedBeaconBlock,
|
|
@@ -57,6 +63,6 @@ export function getAttestationsSignatureSets(
|
|
|
57
63
|
);
|
|
58
64
|
}
|
|
59
65
|
return indexedAttestations.map((indexedAttestation) =>
|
|
60
|
-
getIndexedAttestationSignatureSet(index2pubkey, state, indexedAttestation)
|
|
66
|
+
getIndexedAttestationSignatureSet(config, index2pubkey, state, indexedAttestation)
|
|
61
67
|
);
|
|
62
68
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import {BeaconConfig} from "@lodestar/config";
|
|
1
2
|
import {DOMAIN_BEACON_PROPOSER} from "@lodestar/params";
|
|
2
3
|
import {SignedBeaconBlock, SignedBlindedBeaconBlock, Slot, isBlindedBeaconBlock, phase0, ssz} from "@lodestar/types";
|
|
3
4
|
import {Index2PubkeyCache} from "../cache/pubkeyCache.js";
|
|
@@ -6,20 +7,21 @@ import {computeSigningRoot} from "../util/index.js";
|
|
|
6
7
|
import {ISignatureSet, SignatureSetType, verifySignatureSet} from "../util/signatureSets.js";
|
|
7
8
|
|
|
8
9
|
export function verifyProposerSignature(
|
|
10
|
+
config: BeaconConfig,
|
|
9
11
|
index2pubkey: Index2PubkeyCache,
|
|
10
12
|
state: CachedBeaconStateAllForks,
|
|
11
13
|
signedBlock: SignedBeaconBlock | SignedBlindedBeaconBlock
|
|
12
14
|
): boolean {
|
|
13
|
-
const signatureSet = getBlockProposerSignatureSet(index2pubkey, state, signedBlock);
|
|
15
|
+
const signatureSet = getBlockProposerSignatureSet(config, index2pubkey, state, signedBlock);
|
|
14
16
|
return verifySignatureSet(signatureSet);
|
|
15
17
|
}
|
|
16
18
|
|
|
17
19
|
export function getBlockProposerSignatureSet(
|
|
20
|
+
config: BeaconConfig,
|
|
18
21
|
index2pubkey: Index2PubkeyCache,
|
|
19
22
|
state: CachedBeaconStateAllForks,
|
|
20
23
|
signedBlock: SignedBeaconBlock | SignedBlindedBeaconBlock
|
|
21
24
|
): ISignatureSet {
|
|
22
|
-
const {config} = state;
|
|
23
25
|
const domain = config.getDomain(state.slot, DOMAIN_BEACON_PROPOSER, signedBlock.message.slot);
|
|
24
26
|
|
|
25
27
|
const blockType = isBlindedBeaconBlock(signedBlock.message)
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import {BeaconConfig} from "@lodestar/config";
|
|
1
2
|
import {DOMAIN_BEACON_PROPOSER} from "@lodestar/params";
|
|
2
3
|
import {SignedBeaconBlock, phase0, ssz} from "@lodestar/types";
|
|
3
4
|
import {Index2PubkeyCache} from "../cache/pubkeyCache.js";
|
|
@@ -8,6 +9,7 @@ import {ISignatureSet, SignatureSetType, computeSigningRoot} from "../util/index
|
|
|
8
9
|
* Extract signatures to allow validating all block signatures at once
|
|
9
10
|
*/
|
|
10
11
|
export function getProposerSlashingSignatureSets(
|
|
12
|
+
config: BeaconConfig,
|
|
11
13
|
index2pubkey: Index2PubkeyCache,
|
|
12
14
|
state: CachedBeaconStateAllForks,
|
|
13
15
|
proposerSlashing: phase0.ProposerSlashing
|
|
@@ -17,11 +19,7 @@ export function getProposerSlashingSignatureSets(
|
|
|
17
19
|
// In state transition, ProposerSlashing headers are only partially validated. Their slot could be higher than the
|
|
18
20
|
// clock and the slashing would still be valid. Must use bigint variants to hash correctly to all possible values
|
|
19
21
|
return [proposerSlashing.signedHeader1, proposerSlashing.signedHeader2].map((signedHeader): ISignatureSet => {
|
|
20
|
-
const domain =
|
|
21
|
-
state.slot,
|
|
22
|
-
DOMAIN_BEACON_PROPOSER,
|
|
23
|
-
Number(signedHeader.message.slot as bigint)
|
|
24
|
-
);
|
|
22
|
+
const domain = config.getDomain(state.slot, DOMAIN_BEACON_PROPOSER, Number(signedHeader.message.slot as bigint));
|
|
25
23
|
|
|
26
24
|
return {
|
|
27
25
|
type: SignatureSetType.single,
|
|
@@ -33,11 +31,12 @@ export function getProposerSlashingSignatureSets(
|
|
|
33
31
|
}
|
|
34
32
|
|
|
35
33
|
export function getProposerSlashingsSignatureSets(
|
|
34
|
+
config: BeaconConfig,
|
|
36
35
|
index2pubkey: Index2PubkeyCache,
|
|
37
36
|
state: CachedBeaconStateAllForks,
|
|
38
37
|
signedBlock: SignedBeaconBlock
|
|
39
38
|
): ISignatureSet[] {
|
|
40
39
|
return signedBlock.message.body.proposerSlashings.flatMap((proposerSlashing) =>
|
|
41
|
-
getProposerSlashingSignatureSets(index2pubkey, state, proposerSlashing)
|
|
40
|
+
getProposerSlashingSignatureSets(config, index2pubkey, state, proposerSlashing)
|
|
42
41
|
);
|
|
43
42
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import {BeaconConfig} from "@lodestar/config";
|
|
1
2
|
import {DOMAIN_RANDAO} from "@lodestar/params";
|
|
2
3
|
import {BeaconBlock, ssz} from "@lodestar/types";
|
|
3
4
|
import {Index2PubkeyCache} from "../cache/pubkeyCache.js";
|
|
@@ -11,24 +12,26 @@ import {
|
|
|
11
12
|
} from "../util/index.js";
|
|
12
13
|
|
|
13
14
|
export function verifyRandaoSignature(
|
|
15
|
+
config: BeaconConfig,
|
|
14
16
|
index2pubkey: Index2PubkeyCache,
|
|
15
17
|
state: CachedBeaconStateAllForks,
|
|
16
18
|
block: BeaconBlock
|
|
17
19
|
): boolean {
|
|
18
|
-
return verifySignatureSet(getRandaoRevealSignatureSet(index2pubkey, state, block));
|
|
20
|
+
return verifySignatureSet(getRandaoRevealSignatureSet(config, index2pubkey, state, block));
|
|
19
21
|
}
|
|
20
22
|
|
|
21
23
|
/**
|
|
22
24
|
* Extract signatures to allow validating all block signatures at once
|
|
23
25
|
*/
|
|
24
26
|
export function getRandaoRevealSignatureSet(
|
|
27
|
+
config: BeaconConfig,
|
|
25
28
|
index2pubkey: Index2PubkeyCache,
|
|
26
29
|
state: CachedBeaconStateAllForks,
|
|
27
30
|
block: BeaconBlock
|
|
28
31
|
): ISignatureSet {
|
|
29
32
|
// should not get epoch from epochCtx
|
|
30
33
|
const epoch = computeEpochAtSlot(block.slot);
|
|
31
|
-
const domain =
|
|
34
|
+
const domain = config.getDomain(state.slot, DOMAIN_RANDAO, block.slot);
|
|
32
35
|
|
|
33
36
|
return {
|
|
34
37
|
type: SignatureSetType.single,
|