@lodestar/beacon-node 1.26.0-dev.0ac8bb9647 → 1.26.0-dev.25e78f0a64
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/api/impl/beacon/pool/index.js +11 -5
- package/lib/api/impl/beacon/pool/index.js.map +1 -1
- package/lib/api/impl/config/constants.d.ts +3 -0
- package/lib/api/impl/config/constants.js +4 -1
- package/lib/api/impl/config/constants.js.map +1 -1
- package/lib/api/impl/validator/index.js +1 -1
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/chain/errors/attestationError.d.ts +7 -1
- package/lib/chain/errors/attestationError.js +4 -0
- package/lib/chain/errors/attestationError.js.map +1 -1
- package/lib/chain/opPools/attestationPool.d.ts +2 -2
- package/lib/chain/opPools/attestationPool.js +20 -14
- package/lib/chain/opPools/attestationPool.js.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.js +30 -1
- package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
- package/lib/chain/seenCache/seenAttestationData.d.ts +15 -7
- package/lib/chain/seenCache/seenAttestationData.js +33 -14
- package/lib/chain/seenCache/seenAttestationData.js.map +1 -1
- package/lib/chain/validation/aggregateAndProof.js +2 -2
- package/lib/chain/validation/aggregateAndProof.js.map +1 -1
- package/lib/chain/validation/attestation.d.ts +18 -10
- package/lib/chain/validation/attestation.js +129 -81
- package/lib/chain/validation/attestation.js.map +1 -1
- package/lib/chain/validation/blobSidecar.d.ts +2 -1
- package/lib/chain/validation/blobSidecar.js +8 -7
- package/lib/chain/validation/blobSidecar.js.map +1 -1
- package/lib/chain/validation/block.js +3 -2
- package/lib/chain/validation/block.js.map +1 -1
- package/lib/execution/builder/cache.d.ts +19 -0
- package/lib/execution/builder/cache.js +22 -0
- package/lib/execution/builder/cache.js.map +1 -0
- package/lib/execution/builder/http.d.ts +5 -2
- package/lib/execution/builder/http.js +10 -1
- package/lib/execution/builder/http.js.map +1 -1
- package/lib/execution/builder/index.d.ts +1 -0
- package/lib/execution/builder/index.js +1 -0
- package/lib/execution/builder/index.js.map +1 -1
- package/lib/execution/builder/interface.d.ts +4 -2
- package/lib/execution/builder/utils.d.ts +5 -0
- package/lib/execution/builder/utils.js +17 -0
- package/lib/execution/builder/utils.js.map +1 -0
- package/lib/execution/engine/interface.d.ts +3 -1
- package/lib/execution/engine/interface.js +4 -0
- package/lib/execution/engine/interface.js.map +1 -1
- package/lib/execution/engine/types.d.ts +2 -2
- package/lib/execution/engine/types.js +67 -15
- package/lib/execution/engine/types.js.map +1 -1
- package/lib/network/gossip/interface.d.ts +3 -3
- package/lib/network/gossip/topic.d.ts +13 -7
- package/lib/network/gossip/topic.js +22 -3
- package/lib/network/gossip/topic.js.map +1 -1
- package/lib/network/interface.d.ts +2 -2
- package/lib/network/network.d.ts +2 -2
- package/lib/network/network.js +4 -2
- package/lib/network/network.js.map +1 -1
- package/lib/network/processor/extractSlotRootFns.js +4 -4
- package/lib/network/processor/extractSlotRootFns.js.map +1 -1
- package/lib/network/processor/gossipHandlers.js +14 -7
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/network/processor/gossipQueues/index.js +2 -3
- package/lib/network/processor/gossipQueues/index.js.map +1 -1
- package/lib/network/processor/index.js +1 -1
- package/lib/network/processor/index.js.map +1 -1
- package/lib/network/processor/types.d.ts +2 -1
- package/lib/network/reqresp/ReqRespBeaconNode.js +2 -1
- package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
- package/lib/network/reqresp/handlers/beaconBlocksByRange.d.ts +2 -1
- package/lib/network/reqresp/handlers/beaconBlocksByRange.js +6 -5
- package/lib/network/reqresp/handlers/beaconBlocksByRange.js.map +1 -1
- package/lib/network/reqresp/handlers/blobSidecarsByRange.d.ts +2 -1
- package/lib/network/reqresp/handlers/blobSidecarsByRange.js +6 -5
- package/lib/network/reqresp/handlers/blobSidecarsByRange.js.map +1 -1
- package/lib/network/reqresp/handlers/index.js +2 -1
- package/lib/network/reqresp/handlers/index.js.map +1 -1
- package/lib/network/reqresp/rateLimit.d.ts +2 -2
- package/lib/network/reqresp/rateLimit.js +2 -0
- package/lib/network/reqresp/rateLimit.js.map +1 -1
- package/lib/network/reqresp/types.d.ts +2 -2
- package/lib/network/reqresp/types.js +4 -3
- package/lib/network/reqresp/types.js.map +1 -1
- package/lib/util/sszBytes.d.ts +42 -7
- package/lib/util/sszBytes.js +110 -15
- package/lib/util/sszBytes.js.map +1 -1
- package/lib/util/types.d.ts +3 -2
- package/lib/util/types.js +1 -1
- package/lib/util/types.js.map +1 -1
- package/package.json +14 -14
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attestation.js","sourceRoot":"","sources":["../../../src/chain/validation/attestation.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EAEtB,OAAO,EACP,eAAe,EACf,iBAAiB,GAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,mBAAmB,EAGnB,kBAAkB,EAClB,kBAAkB,EAClB,uBAAuB,EACvB,sCAAsC,GACvC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAUL,oBAAoB,EAEpB,GAAG,GACJ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,kCAAkC,EAAC,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAC,yBAAyB,EAAC,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAC,yBAAyB,EAAC,MAAM,6BAA6B,CAAC;AACtE,OAAO,EACL,2CAA2C,EAC3C,4CAA4C,EAC5C,2CAA2C,EAC3C,yCAAyC,EACzC,kDAAkD,EAClD,qCAAqC,GACtC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAS,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAC,gBAAgB,EAAE,oBAAoB,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAExF,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAoC9C;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,qCAAqC,CACzD,IAAc,EACd,KAAmB,EACnB,qBAA0C,EAC1C,MAAgB;AAChB,oDAAoD;AACpD,iBAAiB,GAAG,mCAAmC;IAEvD,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,EAAC,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAC,CAAC;IAC5C,CAAC;IAED,gEAAgE;IAChE,4DAA4D;IAC5D,yEAAyE;IACzE,oFAAoF;IACpF,MAAM,mBAAmB,GAA0B,EAAE,CAAC;IACtD,KAAK,MAAM,kBAAkB,IAAI,qBAAqB,EAAE,CAAC;QACvD,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC,CAAC;QAClG,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1C,CAAC;IAED,qDAAqD;IACrD,2CAA2C;IAC3C,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACrD,MAAM,aAAa,GAAyB,EAAE,CAAC;IAC/C,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,YAAY,GAAkB,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,CAAC,EAAE,aAAa,CAAC,IAAI,mBAAmB,CAAC,OAAO,EAAE,EAAE,CAAC;QAC/D,IAAI,aAAa,CAAC,GAAG,EAAE,CAAC;YACtB,SAAS;QACX,CAAC;QACD,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACxC,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACpC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACtD,QAAQ,EAAE,CAAC;IACb,CAAC;IAED,IAAI,eAA0B,CAAC;IAC/B,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,kCAAkC,CAAC;IAC3F,IAAI,YAAY,EAAE,CAAC;QACjB,0FAA0F;QAC1F,eAAe,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,8BAA8B,CAC9D,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAC,CAAC,CAAC,EAC/E,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW,CAC7B,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,sEAAsE;QACtE,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC,CACpF,CAAC;IACJ,CAAC;IAED,yBAAyB;IACzB,KAAK,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;QACtD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,oBAAoB;YACpB,MAAM,KAAK,CAAC,kCAAkC,CAAC,EAAE,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,EAAC,cAAc,EAAE,WAAW,EAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QACtD,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QAClD,IAAI,QAAQ,EAAE,CAAC;YACb,yHAAyH;YACzH,EAAE;YACF,wFAAwF;YACxF,oFAAoF;YACpF,qCAAqC;YACrC,IAAI,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,CAAC;gBAC7D,mBAAmB,CAAC,QAAQ,CAAC,GAAG;oBAC9B,GAAG,EAAE,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;wBAC7C,IAAI,EAAE,oBAAoB,CAAC,yBAAyB;wBACpD,WAAW;wBACX,cAAc;qBACf,CAAC;iBACH,CAAC;YACJ,CAAC;YAED,QAAQ;YACR,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QACvD,CAAC;aAAM,CAAC;YACN,mBAAmB,CAAC,QAAQ,CAAC,GAAG;gBAC9B,GAAG,EAAE,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;oBAC7C,IAAI,EAAE,oBAAoB,CAAC,iBAAiB;iBAC7C,CAAC;aACH,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,OAAO,EAAE,mBAAmB;QAC5B,YAAY;KACb,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,IAAc,EACd,KAAmB,EACnB,kBAAkC;IAElC,MAAM,aAAa,GAAG,IAAI,CAAC;IAC3B,MAAM,MAAM,GAAG,IAAI,CAAC;IAEpB,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,mCAAmC,CAAC,IAAI,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;QACvG,MAAM,EAAC,WAAW,EAAE,YAAY,EAAE,cAAc,EAAC,GAAG,WAAW,CAAC;QAChE,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,YAAY,CAAC,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;QAEhH,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YAClD,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;YACrD,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,oBAAoB,CAAC,iBAAiB;SAC7C,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,GAAG,YAAY,eAAe,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,mBAAmB,CAAC,4BAA4B,EAAE,CAAC;YACzG,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;gBAC9C,IAAI,EAAE,oBAAoB,CAAC,gBAAgB;aAC5C,CAAC,CAAC;QACL,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,mCAAmC,CAChD,IAAc,EACd,KAAmB,EACnB,kBAAsC;AACtC,gFAAgF;AAChF,MAAuB;IAEvB,2BAA2B;IAC3B,8CAA8C;IAC9C,wDAAwD;IACxD,4CAA4C;IAC5C,uBAAuB;IACvB,wCAAwC;IAExC,sBAAsB;IACtB,2EAA2E;IAE3E,IAAI,kBAEiF,CAAC;IACtF,IAAI,UAAU,GAA0B,IAAI,CAAC;IAC7C,IAAI,kBAAkB,CAAC,cAAc,EAAE,CAAC;QACtC,SAAS;QACT,MAAM,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC;QAC3C,UAAU,GAAG,sCAAsC,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAC9E,MAAM,aAAa,GAAG,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACvG,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YAC3B,MAAM,WAAW,GAAG,yBAAyB,CAAC,IAAI,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC;YACvF,kEAAkE;YAClE,kBAAkB,GAAG,EAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,kBAAkB,GAAG,EAAC,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,kBAAkB,CAAC,cAAc,EAAC,CAAC;QACpH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM;QACN,UAAU,GAAG,IAAI,CAAC;QAClB,kBAAkB,GAAG,EAAC,WAAW,EAAE,kBAAkB,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC;IAClF,CAAC;IAED,MAAM,OAAO,GAA2B,kBAAkB,CAAC,WAAW;QACpE,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC,IAAI;QACrC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,eAAe,CAAC;IAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAC7B,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IACjC,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC;IACpC,IAAI,cAA6B,CAAC;IAClC,IAAI,kBAAkB,CAAC,WAAW,EAAE,CAAC;QACnC,IAAI,oBAAoB,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;YACzD,uDAAuD;YACvD,MAAM,EAAC,aAAa,EAAC,GAAG,kBAAkB,CAAC,WAAW,CAAC;YACvD,8CAA8C;YAC9C,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;gBAC1B,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE,EAAC,IAAI,EAAE,oBAAoB,CAAC,wBAAwB,EAAC,CAAC,CAAC;YACzG,CAAC;YAED,cAAc,GAAG,aAAa,CAAC,gBAAgB,EAAE,CAAC;YAClD,mGAAmG;YACnG,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;gBAC5B,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE,EAAC,IAAI,EAAE,oBAAoB,CAAC,iCAAiC,EAAC,CAAC,CAAC;YAClH,CAAC;YAED,qCAAqC;YACrC,IAAI,OAAO,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;gBACxB,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE,EAAC,IAAI,EAAE,oBAAoB,CAAC,+BAA+B,EAAC,CAAC,CAAC;YAChH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,qBAAqB;YACrB,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;QACjC,CAAC;IACH,CAAC;SAAM,CAAC;QACN,+BAA+B;QAC/B,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,cAAc,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,OAAO,EAAE,iBAAiB,CAAC,0BAA0B,CAAC,OAAO,CACjE,EAAC,MAAM,EAAE,WAAW,CAAC,yBAAyB,EAAC,EAC/C,KAAK,CAAC,KAAK,CAAC,WAAW,GAAG,OAAO,CAClC,CAAC;IAEF,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAC9B,4IAA4I;QAC5I,IAAI,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;gBAC9C,IAAI,EAAE,oBAAoB,CAAC,gBAAgB;aAC5C,CAAC,CAAC;QACL,CAAC;QAED,iJAAiJ;QACjJ,+GAA+G;QAC/G,mFAAmF;QACnF,0BAA0B,CAAC,IAAI,EAAE,KAAK,EAAE,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpF,CAAC;IAED,kGAAkG;IAClG,+FAA+F;IAC/F,2FAA2F;IAC3F,MAAM,eAAe,GAAG,kBAAkB,CAAC,WAAW;QACpD,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe;QAChD,CAAC,CAAC,2CAA2C,CAAC,IAAI,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC;IACzF,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;QAC7B,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,oBAAoB,CAAC,wBAAwB;SACpD,CAAC,CAAC;IACL,CAAC;IAED,MAAM,QAAQ,GAAG,eAAe,CAAC,gBAAgB,EAAE,CAAC;IACpD,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACtB,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,oBAAoB,CAAC,mCAAmC;SAC/D,CAAC,CAAC;IACL,CAAC;IAED,IAAI,yBAAsC,CAAC;IAC3C,IAAI,cAAgC,CAAC;IACrC,IAAI,cAAwB,CAAC;IAC7B,IAAI,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAC7B,yBAAyB,GAAG,kBAAkB,CAAC,KAAK,CAAC,yBAAyB,CAAC;QAC/E,MAAM,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,WAAW,CAAC;QACzD,cAAc,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC;QACnC,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC;IACnD,CAAC;SAAM,CAAC;QACN,sFAAsF;QACtF,wDAAwD;QACxD,EAAE;QACF,4EAA4E;QAE5E,yGAAyG;QACzG,oGAAoG;QACpG,MAAM,YAAY,GAAG,4BAA4B,CAC/C,KAAK,EACL,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,EACnD,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAC/C,OAAO,EACP,QAAQ,EACR,WAAW,CAAC,yBAAyB,EACrC,KAAK,CAAC,IAAI,CAAC,YAAY,CACxB,CAAC;QAEF,6FAA6F;QAC7F,uDAAuD;QAEvD,sHAAsH;QACtH,oKAAoK;QACpK,uDAAuD;QAEvD,4FAA4F;QAC5F,8JAA8J;QAC9J,uDAAuD;QAEvD,MAAM,SAAS,GAAG,MAAM,sCAAsC,CAC5D,KAAK,EACL,QAAQ,EACR,YAAY,EACZ,WAAW,CAAC,yBAAyB,CACtC,CAAC;QAEF,4DAA4D;QAC5D,8EAA8E;QAC9E,yBAAyB,GAAG,mBAAmB,CAAC,SAAS,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;QACpF,cAAc,GAAG,GAAG,EAAE,CAAC,6BAA6B,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC5E,cAAc,GAAG,oBAAoB,CAAC,SAAS,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,cAAc,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAE3D,qEAAqE;IACrE,wGAAwG;IACxG,gEAAgE;IAChE,IAAI,eAAe,CAAC,MAAM,KAAK,yBAAyB,CAAC,MAAM,EAAE,CAAC;QAChE,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,oBAAoB,CAAC,gCAAgC;SAC5D,CAAC,CAAC;IACL,CAAC;IAED,4BAA4B;IAC5B,wFAAwF;IACxF,yBAAyB;IACzB,iIAAiI;IAEjI,qDAAqD;IACrD,2HAA2H;IAC3H,kGAAkG;IAClG,0FAA0F;IAC1F,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,cAAc,EAAE,CAAC;QACjD,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,oBAAoB,CAAC,iBAAiB;YAC5C,QAAQ,EAAE,MAAM;YAChB,QAAQ,EAAE,cAAc;SACzB,CAAC,CAAC;IACL,CAAC;IAED,+FAA+F;IAC/F,6EAA6E;IAC7E,IAAI,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,CAAC;QAC7D,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,oBAAoB,CAAC,yBAAyB;YACpD,WAAW;YACX,cAAc;SACf,CAAC,CAAC;IACL,CAAC;IAED,kDAAkD;IAClD,MAAM,gBAAgB,GAAG,CAAC,cAAc,CAAC,CAAC;IAC1C,IAAI,YAAgC,CAAC;IACrC,IAAI,cAAuB,CAAC;IAC5B,MAAM,SAAS,GAAG,kBAAkB,CAAC,WAAW;QAC9C,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC,SAAS;QAC1C,CAAC,CAAC,qCAAqC,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;IAC7E,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,oBAAoB,CAAC,wBAAwB;SACpD,CAAC,CAAC;IACL,CAAC;IAED,IAAI,aAAa,GAAyB,SAAS,CAAC;IACpD,IAAI,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAC7B,kGAAkG;QAClG,YAAY,GAAG,sCAAsC,CACnD,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,EAClC,kBAAkB,CAAC,KAAK,CAAC,WAAW,EACpC,SAAS,CACV,CAAC;QACF,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,cAAc,CAAC;QACzD,aAAa,GAAG,kBAAkB,CAAC,KAAK,CAAC,aAAa,CAAC;IACzD,CAAC;SAAM,CAAC;QACN,YAAY,GAAG,sCAAsC,CACnD,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,EAClC,cAAc,EAAE,EAChB,SAAS,CACV,CAAC;QAEF,yDAAyD;QACzD,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7E,iEAAiE;QACjE,aAAa,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,WAAW,CAAC;YAClE,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC,aAAa,CAAC,KAAK,EAAE;YACtD,CAAC,CAAC,SAAS,CAAC;QACd,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE;gBAClD,yBAAyB;gBACzB,aAAa;gBACb,cAAc;gBACd,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,MAAM,EAAE,cAAc;gBACtB,2CAA2C;gBAC3C,sFAAsF;gBACtF,cAAc;gBACd,eAAe,EAAE,OAAO;aACzB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,2CAA2C;IAC3C,MAAM,yBAAyB,GAAG;QAChC,gBAAgB;QAChB,IAAI,EAAE,OAAO;QACb,SAAS;KACV,CAAC;IACF,MAAM,kBAAkB,GACtB,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,OAAO;QAC9B,CAAC,CAAE,yBAAwD;QAC3D,CAAC,CAAE,yBAAuD,CAAC;IAE/D,MAAM,WAAW,GAAgB,kBAAkB,CAAC,WAAW,IAAI;QACjE,eAAe;QACf,IAAI,EAAE,OAAO;QACb,aAAa;QACb,SAAS;KACV,CAAC;IACF,OAAO;QACL,WAAW;QACX,kBAAkB;QAClB,MAAM,EAAE,cAAc;QACtB,cAAc;QACd,YAAY;QACZ,cAAc;QACd,cAAc;KACf,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,0BAA0B,CAAC,IAAc,EAAE,KAAmB,EAAE,eAAqB;IACnG,mEAAmE;IACnE,MAAM,qBAAqB,GAAG,KAAK,CAAC,KAAK,CAAC,uBAAuB,CAAC,kCAAkC,CAAC,CAAC;IACtG,IAAI,eAAe,GAAG,qBAAqB,EAAE,CAAC;QAC5C,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,oBAAoB,CAAC,WAAW;YACtC,qBAAqB;YACrB,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,uBAAuB,GAAG,IAAI,CAAC,GAAG;IACtC,iEAAiE;IACjE,uDAAuD;IACvD,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC,kCAAkC,CAAC,GAAG,eAAe,EACvF,CAAC,CACF,CAAC;IAEF,8EAA8E;IAC9E,wEAAwE;IACxE,EAAE;IACF,6DAA6D;IAC7D,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;QAClC,IAAI,eAAe,GAAG,uBAAuB,EAAE,CAAC;YAC9C,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;gBAC9C,IAAI,EAAE,oBAAoB,CAAC,SAAS;gBACpC,uBAAuB;gBACvB,eAAe;aAChB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,eAAe,CAAC,CAAC;QAE7D,0EAA0E;QAC1E,MAAM,6BAA6B,GAAG,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;QAChF,IAAI,gBAAgB,GAAG,6BAA6B,EAAE,CAAC;YACrD,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;gBAC9C,IAAI,EAAE,oBAAoB,CAAC,YAAY;gBACvC,YAAY,EAAE,6BAA6B;gBAC3C,gBAAgB;aACjB,CAAC,CAAC;QACL,CAAC;QAED,6EAA6E;QAC7E,MAAM,gCAAgC,GAAG,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;QACrF,IAAI,gBAAgB,GAAG,gCAAgC,EAAE,CAAC;YACxD,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;gBAC9C,IAAI,EAAE,oBAAoB,CAAC,UAAU;gBACrC,aAAa,EAAE,gCAAgC;gBAC/C,gBAAgB;aACjB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,4BAA4B,CAC1C,KAAmB,EACnB,eAAqB,EACrB,UAAgB,EAChB,eAAqB,EACrB,gBAAuB,EACvB,MAAmB,EACnB,YAAqB;IAErB,MAAM,SAAS,GAAG,sBAAsB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IACjE,0GAA0G;IAC1G,yCAAyC;IACzC,+GAA+G;IAC/G,yDAAyD;IACzD,MAAM,YAAY,GAAG,eAAe,GAAG,SAAS,CAAC,IAAI,CAAC;IACtD,KAAK,CAAC,OAAO,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAAC,MAAM,EAAC,EAAE,YAAY,CAAC,CAAC;IAE3F,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,GAAG,YAAY,EAAE,CAAC;QAC9D,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,oBAAoB,CAAC,sBAAsB;YACjD,eAAe;YACf,aAAa,EAAE,SAAS,CAAC,IAAI;SAC9B,CAAC,CAAC;IACL,CAAC;IACD,2BAA2B,CAAC,SAAS,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;IACrE,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,sCAAsC,CAC1D,KAAmB,EACnB,QAAe,EACf,YAAwB,EACxB,WAAwB;IAExB,MAAM,UAAU,GAAG,kBAAkB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,sBAAsB,GAAG,yBAAyB,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;IAE/G,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;IACnF,IAAI,SAAS,EAAE,CAAC;QACd,2DAA2D;QAC3D,KAAK,CAAC,OAAO,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,WAAW,EAAC,CAAC,CAAC;QAC9E,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,OAAO,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,WAAW,EAAC,CAAC,CAAC;IAC/E,IAAI,CAAC;QACH,uFAAuF;QACvF,8FAA8F;QAC9F,KAAK,CAAC,OAAO,EAAE,iBAAiB,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,WAAW,EAAC,CAAC,CAAC;QACnF,OAAO,MAAM,KAAK,CAAC,oCAAoC,CACrD,QAAQ,EACR,sBAAsB,EACtB,YAAY,EACZ,WAAW,CACZ,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,KAAK,CAAC,OAAO,EAAE,iBAAiB,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAC,MAAM,EAAE,WAAW,EAAC,CAAC,CAAC;QACpF,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,oBAAoB,CAAC,mCAAmC;YAC9D,KAAK,EAAE,CAAU;SAClB,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,6BAA6B,CAAC,MAAoB,EAAE,IAA4B;IAC9F,MAAM,IAAI,GAAG,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACxD,4FAA4F;IAC5F,2KAA2K;IAC3K,qEAAqE;IACrE,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IACpE,OAAO,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AACtE,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAS,sBAAsB,CAAC,KAAmB,EAAE,eAAqB;IACxE,4EAA4E;IAE5E,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC7D,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,oBAAoB,CAAC,yCAAyC;YACpE,IAAI,EAAE,SAAS,CAAC,eAAe,CAAC;SACjC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;GAGG;AACH,SAAS,2BAA2B,CAAC,SAAqB,EAAE,UAAgB,EAAE,gBAAuB;IACnG,qCAAqC;IACrC,MAAM,cAAc,GAAG,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAE1D,IAAI,cAAc,GAAG,gBAAgB,EAAE,CAAC;QACtC,kEAAkE;QAClE,EAAE;QACF,2FAA2F;QAC3F,2CAA2C;QAC3C,EAAE;QACF,qFAAqF;QACrF,4EAA4E;QAC5E,EAAE;QACF,aAAa;QACb,+EAA+E;QAC/E,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,oBAAoB,CAAC,mBAAmB;YAC9C,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC;YACjC,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;IACL,CAAC;IAED,MAAM,kBAAkB,GACtB,cAAc,KAAK,gBAAgB;QACjC,CAAC,CAAC,iFAAiF;YACjF,kBAAkB;YAClB,SAAS,CAAC,UAAU;QACtB,CAAC,CAAC,uFAAuF;YACvF,wCAAwC;YACxC,EAAE;YACF,2EAA2E;YAC3E,SAAS,CAAC,SAAS,CAAC;IAE1B,kEAAkE;IAClE,IAAI,kBAAkB,KAAK,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;QACjD,sDAAsD;QACtD,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,oBAAoB,CAAC,mBAAmB;YAC9C,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC;YACjC,QAAQ,EAAE,kBAAkB;SAC7B,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CACjC,SAAyB,EACzB,eAAqB,EACrB,gBAAwB;IAExB,MAAM,EAAC,UAAU,EAAC,GAAG,SAAS,CAAC;IAC/B,MAAM,cAAc,GAAG,UAAU,CAAC,eAAe,GAAG,eAAe,CAAC,CAAC;IAErE,IAAI,gBAAgB,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;QAC9C,MAAM,IAAI,gBAAgB,CAAC,YAAY,CAAC,MAAM,EAAE;YAC9C,IAAI,EAAE,oBAAoB,CAAC,4BAA4B;YACvD,KAAK,EAAE,gBAAgB;SACxB,CAAC,CAAC;IACL,CAAC;IACD,OAAO,cAAc,CAAC,gBAAgB,CAAC,CAAC;AAC1C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,SAAyB,EAAE,IAAY,EAAE,cAAsB;IAClG,MAAM,oBAAoB,GAAG,IAAI,GAAG,eAAe,CAAC;IACpD,MAAM,yBAAyB,GAAG,SAAS,CAAC,iBAAiB,GAAG,oBAAoB,CAAC;IACrF,OAAO,CAAC,yBAAyB,GAAG,cAAc,CAAC,GAAG,wBAAwB,CAAC;AACjF,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sCAAsC,CACpD,IAAc,EACd,WAA8B;IAE9B,MAAM,EAAC,aAAa,EAAE,cAAc,EAAC,GAAG,WAAW,CAAC;IACpD,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,MAAM,aAAa,GAAG,yCAAyC,CAAC,cAAc,CAAC,CAAC;QAChF,OAAO,aAAa,IAAI,aAAa,CAAC,CAAC,CAAC,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/E,CAAC;IAED,cAAc;IACd,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,4CAA4C,CAC1D,IAAc,EACd,iBAA6B;IAE7B,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,4CAA4C,CAAC,iBAAiB,CAAC,CAAC;QAChF,MAAM,aAAa,GAAG,kDAAkD,CAAC,iBAAiB,CAAC,CAAC;QAC5F,OAAO,OAAO,IAAI,aAAa,CAAC,CAAC,CAAC,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC;IACnE,CAAC;IAED,cAAc;IACd,OAAO,2CAA2C,CAAC,iBAAiB,CAAC,CAAC;AACxE,CAAC"}
|
|
1
|
+
{"version":3,"file":"attestation.js","sourceRoot":"","sources":["../../../src/chain/validation/attestation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { ForkName } from "@lodestar/params";
|
|
1
2
|
import { Root, Slot, SubnetID, deneb } from "@lodestar/types";
|
|
2
3
|
import { IBeaconChain } from "../interface.js";
|
|
3
|
-
export declare function validateGossipBlobSidecar(chain: IBeaconChain, blobSidecar: deneb.BlobSidecar, subnet: SubnetID): Promise<void>;
|
|
4
|
+
export declare function validateGossipBlobSidecar(fork: ForkName, chain: IBeaconChain, blobSidecar: deneb.BlobSidecar, subnet: SubnetID): Promise<void>;
|
|
4
5
|
export declare function validateBlobSidecars(blockSlot: Slot, blockRoot: Root, expectedKzgCommitments: deneb.BlobKzgCommitments, blobSidecars: deneb.BlobSidecars, opts?: {
|
|
5
6
|
skipProofsCheck: boolean;
|
|
6
7
|
}): void;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { KZG_COMMITMENT_INCLUSION_PROOF_DEPTH, KZG_COMMITMENT_SUBTREE_INDEX0 } from "@lodestar/params";
|
|
1
|
+
import { KZG_COMMITMENT_INCLUSION_PROOF_DEPTH, KZG_COMMITMENT_SUBTREE_INDEX0, isForkPostElectra, } from "@lodestar/params";
|
|
2
2
|
import { computeStartSlotAtEpoch, getBlockHeaderProposerSignatureSet } from "@lodestar/state-transition";
|
|
3
3
|
import { ssz } from "@lodestar/types";
|
|
4
4
|
import { toRootHex, verifyMerkleBranch } from "@lodestar/utils";
|
|
@@ -7,18 +7,19 @@ import { ckzg } from "../../util/kzg.js";
|
|
|
7
7
|
import { BlobSidecarErrorCode, BlobSidecarGossipError } from "../errors/blobSidecarError.js";
|
|
8
8
|
import { GossipAction } from "../errors/gossipValidation.js";
|
|
9
9
|
import { RegenCaller } from "../regen/index.js";
|
|
10
|
-
export async function validateGossipBlobSidecar(chain, blobSidecar, subnet) {
|
|
10
|
+
export async function validateGossipBlobSidecar(fork, chain, blobSidecar, subnet) {
|
|
11
11
|
const blobSlot = blobSidecar.signedBlockHeader.message.slot;
|
|
12
12
|
// [REJECT] The sidecar's index is consistent with `MAX_BLOBS_PER_BLOCK` -- i.e. `blob_sidecar.index < MAX_BLOBS_PER_BLOCK`.
|
|
13
|
-
|
|
13
|
+
const maxBlobsPerBlock = chain.config.getMaxBlobsPerBlock(fork);
|
|
14
|
+
if (blobSidecar.index >= maxBlobsPerBlock) {
|
|
14
15
|
throw new BlobSidecarGossipError(GossipAction.REJECT, {
|
|
15
16
|
code: BlobSidecarErrorCode.INDEX_TOO_LARGE,
|
|
16
17
|
blobIdx: blobSidecar.index,
|
|
17
|
-
maxBlobsPerBlock
|
|
18
|
+
maxBlobsPerBlock,
|
|
18
19
|
});
|
|
19
20
|
}
|
|
20
21
|
// [REJECT] The sidecar is for the correct subnet -- i.e. `compute_subnet_for_blob_sidecar(sidecar.index) == subnet_id`.
|
|
21
|
-
if (computeSubnetForBlobSidecar(
|
|
22
|
+
if (computeSubnetForBlobSidecar(fork, chain.config, blobSidecar.index) !== subnet) {
|
|
22
23
|
throw new BlobSidecarGossipError(GossipAction.REJECT, {
|
|
23
24
|
code: BlobSidecarErrorCode.INVALID_INDEX,
|
|
24
25
|
blobIdx: blobSidecar.index,
|
|
@@ -186,7 +187,7 @@ function validateBlobsAndProofs(expectedKzgCommitments, blobs, proofs) {
|
|
|
186
187
|
function validateInclusionProof(blobSidecar) {
|
|
187
188
|
return verifyMerkleBranch(ssz.deneb.KZGCommitment.hashTreeRoot(blobSidecar.kzgCommitment), blobSidecar.kzgCommitmentInclusionProof, KZG_COMMITMENT_INCLUSION_PROOF_DEPTH, KZG_COMMITMENT_SUBTREE_INDEX0 + blobSidecar.index, blobSidecar.signedBlockHeader.message.bodyRoot);
|
|
188
189
|
}
|
|
189
|
-
function computeSubnetForBlobSidecar(
|
|
190
|
-
return blobIndex % config.BLOB_SIDECAR_SUBNET_COUNT;
|
|
190
|
+
function computeSubnetForBlobSidecar(fork, config, blobIndex) {
|
|
191
|
+
return (blobIndex % (isForkPostElectra(fork) ? config.BLOB_SIDECAR_SUBNET_COUNT_ELECTRA : config.BLOB_SIDECAR_SUBNET_COUNT));
|
|
191
192
|
}
|
|
192
193
|
//# sourceMappingURL=blobSidecar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blobSidecar.js","sourceRoot":"","sources":["../../../src/chain/validation/blobSidecar.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"blobSidecar.js","sourceRoot":"","sources":["../../../src/chain/validation/blobSidecar.ts"],"names":[],"mappings":"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"}
|
|
@@ -88,11 +88,12 @@ export async function validateGossipBlock(config, chain, signedBlock, fork) {
|
|
|
88
88
|
// [REJECT] The length of KZG commitments is less than or equal to the limitation defined in Consensus Layer -- i.e. validate that len(body.signed_beacon_block.message.blob_kzg_commitments) <= MAX_BLOBS_PER_BLOCK
|
|
89
89
|
if (isForkBlobs(fork)) {
|
|
90
90
|
const blobKzgCommitmentsLen = block.body.blobKzgCommitments.length;
|
|
91
|
-
|
|
91
|
+
const maxBlobsPerBlock = chain.config.getMaxBlobsPerBlock(fork);
|
|
92
|
+
if (blobKzgCommitmentsLen > maxBlobsPerBlock) {
|
|
92
93
|
throw new BlockGossipError(GossipAction.REJECT, {
|
|
93
94
|
code: BlockErrorCode.TOO_MANY_KZG_COMMITMENTS,
|
|
94
95
|
blobKzgCommitmentsLen,
|
|
95
|
-
commitmentLimit:
|
|
96
|
+
commitmentLimit: maxBlobsPerBlock,
|
|
96
97
|
});
|
|
97
98
|
}
|
|
98
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block.js","sourceRoot":"","sources":["../../../src/chain/validation/block.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"block.js","sourceRoot":"","sources":["../../../src/chain/validation/block.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { BLSPubkey, Epoch, bellatrix } from "@lodestar/types";
|
|
2
|
+
export type ValidatorRegistration = {
|
|
3
|
+
epoch: Epoch;
|
|
4
|
+
/** Preferred gas limit of validator */
|
|
5
|
+
gasLimit: number;
|
|
6
|
+
};
|
|
7
|
+
export declare class ValidatorRegistrationCache {
|
|
8
|
+
/**
|
|
9
|
+
* Map to track registrations by validator pubkey which is used here instead of
|
|
10
|
+
* validator index as `bellatrix.ValidatorRegistrationV1` does not contain the index
|
|
11
|
+
* and builder flow in general prefers to use pubkey over index.
|
|
12
|
+
*/
|
|
13
|
+
private readonly registrationByValidatorPubkey;
|
|
14
|
+
constructor();
|
|
15
|
+
add(epoch: Epoch, { pubkey, gasLimit }: bellatrix.ValidatorRegistrationV1): void;
|
|
16
|
+
prune(epoch: Epoch): void;
|
|
17
|
+
get(pubkey: BLSPubkey): ValidatorRegistration | undefined;
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=cache.d.ts.map
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { toPubkeyHex } from "@lodestar/utils";
|
|
2
|
+
const REGISTRATION_PRESERVE_EPOCHS = 2;
|
|
3
|
+
export class ValidatorRegistrationCache {
|
|
4
|
+
constructor() {
|
|
5
|
+
this.registrationByValidatorPubkey = new Map();
|
|
6
|
+
}
|
|
7
|
+
add(epoch, { pubkey, gasLimit }) {
|
|
8
|
+
this.registrationByValidatorPubkey.set(toPubkeyHex(pubkey), { epoch, gasLimit });
|
|
9
|
+
}
|
|
10
|
+
prune(epoch) {
|
|
11
|
+
for (const [pubkeyHex, registration] of this.registrationByValidatorPubkey.entries()) {
|
|
12
|
+
// We only retain an registrations for REGISTRATION_PRESERVE_EPOCHS epochs
|
|
13
|
+
if (registration.epoch + REGISTRATION_PRESERVE_EPOCHS < epoch) {
|
|
14
|
+
this.registrationByValidatorPubkey.delete(pubkeyHex);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
get(pubkey) {
|
|
19
|
+
return this.registrationByValidatorPubkey.get(toPubkeyHex(pubkey));
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../src/execution/builder/cache.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C,MAAM,4BAA4B,GAAG,CAAC,CAAC;AAQvC,MAAM,OAAO,0BAA0B;IAOrC;QACE,IAAI,CAAC,6BAA6B,GAAG,IAAI,GAAG,EAAE,CAAC;IACjD,CAAC;IAED,GAAG,CAAC,KAAY,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAoC;QACrE,IAAI,CAAC,6BAA6B,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,EAAC,KAAK,EAAE,QAAQ,EAAC,CAAC,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,KAAY;QAChB,KAAK,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,IAAI,IAAI,CAAC,6BAA6B,CAAC,OAAO,EAAE,EAAE,CAAC;YACrF,0EAA0E;YAC1E,IAAI,YAAY,CAAC,KAAK,GAAG,4BAA4B,GAAG,KAAK,EAAE,CAAC;gBAC9D,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;IACH,CAAC;IAED,GAAG,CAAC,MAAiB;QACnB,OAAO,IAAI,CAAC,6BAA6B,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IACrE,CAAC;CACF"}
|
|
@@ -2,8 +2,9 @@ import { ApiClient as BuilderApi } from "@lodestar/api/builder";
|
|
|
2
2
|
import { ChainForkConfig } from "@lodestar/config";
|
|
3
3
|
import { Logger } from "@lodestar/logger";
|
|
4
4
|
import { ForkExecution } from "@lodestar/params";
|
|
5
|
-
import { BLSPubkey, ExecutionPayloadHeader, Root, SignedBeaconBlockOrContents, SignedBlindedBeaconBlock, Slot, Wei, WithOptionalBytes, bellatrix, deneb, electra } from "@lodestar/types";
|
|
5
|
+
import { BLSPubkey, Epoch, ExecutionPayloadHeader, Root, SignedBeaconBlockOrContents, SignedBlindedBeaconBlock, Slot, Wei, WithOptionalBytes, bellatrix, deneb, electra } from "@lodestar/types";
|
|
6
6
|
import { Metrics } from "../../metrics/metrics.js";
|
|
7
|
+
import { ValidatorRegistration, ValidatorRegistrationCache } from "./cache.js";
|
|
7
8
|
import { IExecutionBuilder } from "./interface.js";
|
|
8
9
|
export type ExecutionBuilderHttpOpts = {
|
|
9
10
|
enabled: boolean;
|
|
@@ -26,6 +27,7 @@ export declare class NoBidReceived extends Error {
|
|
|
26
27
|
export declare class ExecutionBuilderHttp implements IExecutionBuilder {
|
|
27
28
|
readonly api: BuilderApi;
|
|
28
29
|
readonly config: ChainForkConfig;
|
|
30
|
+
readonly registrations: ValidatorRegistrationCache;
|
|
29
31
|
readonly issueLocalFcUWithFeeRecipient?: string;
|
|
30
32
|
status: boolean;
|
|
31
33
|
faultInspectionWindow: number;
|
|
@@ -39,7 +41,8 @@ export declare class ExecutionBuilderHttp implements IExecutionBuilder {
|
|
|
39
41
|
constructor(opts: ExecutionBuilderHttpOpts, config: ChainForkConfig, metrics?: Metrics | null, logger?: Logger);
|
|
40
42
|
updateStatus(shouldEnable: boolean): void;
|
|
41
43
|
checkStatus(): Promise<void>;
|
|
42
|
-
registerValidator(registrations: bellatrix.SignedValidatorRegistrationV1[]): Promise<void>;
|
|
44
|
+
registerValidator(epoch: Epoch, registrations: bellatrix.SignedValidatorRegistrationV1[]): Promise<void>;
|
|
45
|
+
getValidatorRegistration(pubkey: BLSPubkey): ValidatorRegistration | undefined;
|
|
43
46
|
getHeader(_fork: ForkExecution, slot: Slot, parentHash: Root, proposerPubkey: BLSPubkey): Promise<{
|
|
44
47
|
header: ExecutionPayloadHeader;
|
|
45
48
|
executionPayloadValue: Wei;
|
|
@@ -3,6 +3,7 @@ import { getClient } from "@lodestar/api/builder";
|
|
|
3
3
|
import { SLOTS_PER_EPOCH } from "@lodestar/params";
|
|
4
4
|
import { parseExecutionPayloadAndBlobsBundle, reconstructFullBlockOrContents } from "@lodestar/state-transition";
|
|
5
5
|
import { toPrintableUrl } from "@lodestar/utils";
|
|
6
|
+
import { ValidatorRegistrationCache } from "./cache.js";
|
|
6
7
|
export const defaultExecutionBuilderHttpOpts = {
|
|
7
8
|
enabled: false,
|
|
8
9
|
url: "http://localhost:8661",
|
|
@@ -45,6 +46,7 @@ export class ExecutionBuilderHttp {
|
|
|
45
46
|
}, { config, metrics: metrics?.builderHttpClient, logger });
|
|
46
47
|
logger?.info("External builder", { url: toPrintableUrl(baseUrl) });
|
|
47
48
|
this.config = config;
|
|
49
|
+
this.registrations = new ValidatorRegistrationCache();
|
|
48
50
|
this.issueLocalFcUWithFeeRecipient = opts.issueLocalFcUWithFeeRecipient;
|
|
49
51
|
/**
|
|
50
52
|
* Beacon clients select randomized values from the following ranges when initializing
|
|
@@ -71,8 +73,15 @@ export class ExecutionBuilderHttp {
|
|
|
71
73
|
throw e;
|
|
72
74
|
}
|
|
73
75
|
}
|
|
74
|
-
async registerValidator(registrations) {
|
|
76
|
+
async registerValidator(epoch, registrations) {
|
|
75
77
|
(await this.api.registerValidator({ registrations })).assertOk();
|
|
78
|
+
for (const registration of registrations) {
|
|
79
|
+
this.registrations.add(epoch, registration.message);
|
|
80
|
+
}
|
|
81
|
+
this.registrations.prune(epoch);
|
|
82
|
+
}
|
|
83
|
+
getValidatorRegistration(pubkey) {
|
|
84
|
+
return this.registrations.get(pubkey);
|
|
76
85
|
}
|
|
77
86
|
async getHeader(_fork, slot, parentHash, proposerPubkey) {
|
|
78
87
|
const res = await this.api.getHeader({ slot, parentHash, proposerPubkey }, { timeoutMs: BUILDER_PROPOSAL_DELAY_TOLERANCE });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/execution/builder/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAA0B,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAGzE,OAAO,EAAgB,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAC,mCAAmC,EAAE,8BAA8B,EAAC,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/execution/builder/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { ChainForkConfig } from "@lodestar/config";
|
|
|
2
2
|
import { Logger } from "@lodestar/logger";
|
|
3
3
|
import { Metrics } from "../../metrics/metrics.js";
|
|
4
4
|
import { IExecutionBuilder } from "./interface.js";
|
|
5
|
+
export { getExpectedGasLimit } from "./utils.js";
|
|
5
6
|
import { ExecutionBuilderHttp, ExecutionBuilderHttpOpts, defaultExecutionBuilderHttpOpts } from "./http.js";
|
|
6
7
|
export { ExecutionBuilderHttp, defaultExecutionBuilderHttpOpts };
|
|
7
8
|
export type ExecutionBuilderOpts = {
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
export { getExpectedGasLimit } from "./utils.js";
|
|
1
2
|
import { ExecutionBuilderHttp, defaultExecutionBuilderHttpOpts } from "./http.js";
|
|
2
3
|
export { ExecutionBuilderHttp, defaultExecutionBuilderHttpOpts };
|
|
3
4
|
export const defaultExecutionBuilderOpts = defaultExecutionBuilderHttpOpts;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/execution/builder/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/execution/builder/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAC,oBAAoB,EAA4B,+BAA+B,EAAC,MAAM,WAAW,CAAC;AAE1G,OAAO,EAAC,oBAAoB,EAAE,+BAA+B,EAAC,CAAC;AAG/D,MAAM,CAAC,MAAM,2BAA2B,GAAyB,+BAA+B,CAAC;AAEjG,MAAM,UAAU,0BAA0B,CACxC,IAA0B,EAC1B,MAAuB,EACvB,UAA0B,IAAI,EAC9B,MAAe;IAEf,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,MAAM;YACT,OAAO,IAAI,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACjE;YACE,OAAO,IAAI,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;AACH,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ForkExecution } from "@lodestar/params";
|
|
2
|
-
import { BLSPubkey, ExecutionPayloadHeader, Root, SignedBeaconBlockOrContents, SignedBlindedBeaconBlock, Slot, Wei, WithOptionalBytes, bellatrix, deneb, electra } from "@lodestar/types";
|
|
2
|
+
import { BLSPubkey, Epoch, ExecutionPayloadHeader, Root, SignedBeaconBlockOrContents, SignedBlindedBeaconBlock, Slot, Wei, WithOptionalBytes, bellatrix, deneb, electra } from "@lodestar/types";
|
|
3
|
+
import { ValidatorRegistration } from "./cache.js";
|
|
3
4
|
export interface IExecutionBuilder {
|
|
4
5
|
/**
|
|
5
6
|
* This param is only to for testing scripts using merge-mock which need
|
|
@@ -14,7 +15,8 @@ export interface IExecutionBuilder {
|
|
|
14
15
|
allowedFaults: number;
|
|
15
16
|
updateStatus(shouldEnable: boolean): void;
|
|
16
17
|
checkStatus(): Promise<void>;
|
|
17
|
-
registerValidator(registrations: bellatrix.SignedValidatorRegistrationV1[]): Promise<void>;
|
|
18
|
+
registerValidator(epoch: Epoch, registrations: bellatrix.SignedValidatorRegistrationV1[]): Promise<void>;
|
|
19
|
+
getValidatorRegistration(pubkey: BLSPubkey): ValidatorRegistration | undefined;
|
|
18
20
|
getHeader(fork: ForkExecution, slot: Slot, parentHash: Root, proposerPubKey: BLSPubkey): Promise<{
|
|
19
21
|
header: ExecutionPayloadHeader;
|
|
20
22
|
executionPayloadValue: Wei;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* From https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md
|
|
3
|
+
*/
|
|
4
|
+
const gasLimitAdjustmentFactor = 1024;
|
|
5
|
+
/**
|
|
6
|
+
* Calculates expected gas limit based on parent gas limit and target gas limit
|
|
7
|
+
*/
|
|
8
|
+
export function getExpectedGasLimit(parentGasLimit, targetGasLimit) {
|
|
9
|
+
const maxGasLimitDifference = Math.max(Math.floor(parentGasLimit / gasLimitAdjustmentFactor) - 1, 0);
|
|
10
|
+
if (targetGasLimit > parentGasLimit) {
|
|
11
|
+
const gasDiff = targetGasLimit - parentGasLimit;
|
|
12
|
+
return parentGasLimit + Math.min(gasDiff, maxGasLimitDifference);
|
|
13
|
+
}
|
|
14
|
+
const gasDiff = parentGasLimit - targetGasLimit;
|
|
15
|
+
return parentGasLimit - Math.min(gasDiff, maxGasLimitDifference);
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/execution/builder/utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,wBAAwB,GAAG,IAAI,CAAC;AAEtC;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,cAAsB,EAAE,cAAsB;IAChF,MAAM,qBAAqB,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAErG,IAAI,cAAc,GAAG,cAAc,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,cAAc,GAAG,cAAc,CAAC;QAChD,OAAO,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,OAAO,GAAG,cAAc,GAAG,cAAc,CAAC;IAChD,OAAO,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;AACnE,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ForkName } from "@lodestar/params";
|
|
1
|
+
import { CONSOLIDATION_REQUEST_TYPE, DEPOSIT_REQUEST_TYPE, ForkName, WITHDRAWAL_REQUEST_TYPE } from "@lodestar/params";
|
|
2
2
|
import { ExecutionPayload, ExecutionRequests, Root, RootHex, Wei, capella } from "@lodestar/types";
|
|
3
3
|
import { Blob, BlobAndProof, KZGCommitment, KZGProof } from "@lodestar/types/deneb";
|
|
4
4
|
import { DATA } from "../../eth1/provider/utils.js";
|
|
@@ -52,6 +52,8 @@ export declare enum ClientCode {
|
|
|
52
52
|
RH = "RH",// reth
|
|
53
53
|
XX = "XX"
|
|
54
54
|
}
|
|
55
|
+
export type ExecutionRequestType = typeof DEPOSIT_REQUEST_TYPE | typeof WITHDRAWAL_REQUEST_TYPE | typeof CONSOLIDATION_REQUEST_TYPE;
|
|
56
|
+
export declare function isExecutionRequestType(type: number): type is ExecutionRequestType;
|
|
55
57
|
export type ExecutePayloadResponse = {
|
|
56
58
|
status: ExecutionPayloadStatus.SYNCING | ExecutionPayloadStatus.ACCEPTED;
|
|
57
59
|
latestValidHash: null;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { CONSOLIDATION_REQUEST_TYPE, DEPOSIT_REQUEST_TYPE, WITHDRAWAL_REQUEST_TYPE } from "@lodestar/params";
|
|
1
2
|
import { PayloadIdCache } from "./payloadIdCache.js";
|
|
2
3
|
export { PayloadIdCache };
|
|
3
4
|
export var ExecutionPayloadStatus;
|
|
@@ -50,4 +51,7 @@ export var ClientCode;
|
|
|
50
51
|
ClientCode["RH"] = "RH";
|
|
51
52
|
ClientCode["XX"] = "XX";
|
|
52
53
|
})(ClientCode || (ClientCode = {}));
|
|
54
|
+
export function isExecutionRequestType(type) {
|
|
55
|
+
return type === DEPOSIT_REQUEST_TYPE || type === WITHDRAWAL_REQUEST_TYPE || type === CONSOLIDATION_REQUEST_TYPE;
|
|
56
|
+
}
|
|
53
57
|
//# sourceMappingURL=interface.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/execution/engine/interface.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../src/execution/engine/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,0BAA0B,EAAE,oBAAoB,EAAY,uBAAuB,EAAC,MAAM,kBAAkB,CAAC;AAKrH,OAAO,EAAY,cAAc,EAAe,MAAM,qBAAqB,CAAC;AAG5E,OAAO,EAAC,cAAc,EAAoC,CAAC;AAE3D,MAAM,CAAN,IAAY,sBAoBX;AApBD,WAAY,sBAAsB;IAChC,6BAA6B;IAC7B,yCAAe,CAAA;IACf,+BAA+B;IAC/B,6CAAmB,CAAA;IACnB,kCAAkC;IAClC,6CAAmB,CAAA;IACnB;;;OAGG;IACH,+CAAqB,CAAA;IACrB,2BAA2B;IAC3B,mEAAyC,CAAA;IACzC,eAAe;IACf,6CAAmB,CAAA;IACnB,qBAAqB;IACrB,qDAA2B,CAAA;IAC3B,wFAAwF;IACxF,+EAAqD,CAAA;AACvD,CAAC,EApBW,sBAAsB,KAAtB,sBAAsB,QAoBjC;AAED,MAAM,CAAN,IAAY,oBAMX;AAND,WAAY,oBAAoB;IAC9B,yCAAiB,CAAA;IACjB,2CAAmB,CAAA;IACnB,2CAAmB,CAAA;IACnB,yCAAiB,CAAA;IACjB,mDAA2B,CAAA;AAC7B,CAAC,EANW,oBAAoB,KAApB,oBAAoB,QAM/B;AAED;;;GAGG;AACH,MAAM,CAAN,IAAY,UAcX;AAdD,WAAY,UAAU;IACpB,uBAAS,CAAA;IACT,uBAAS,CAAA;IACT,uBAAS,CAAA;IACT,uBAAS,CAAA;IACT,uBAAS,CAAA;IACT,uBAAS,CAAA;IACT,uBAAS,CAAA;IACT,uBAAS,CAAA;IACT,uBAAS,CAAA;IACT,uBAAS,CAAA;IACT,uBAAS,CAAA;IACT,uBAAS,CAAA;IACT,uBAAS,CAAA;AACX,CAAC,EAdW,UAAU,KAAV,UAAU,QAcrB;AAOD,MAAM,UAAU,sBAAsB,CAAC,IAAY;IACjD,OAAO,IAAI,KAAK,oBAAoB,IAAI,IAAI,KAAK,uBAAuB,IAAI,IAAI,KAAK,0BAA0B,CAAC;AAClH,CAAC"}
|
|
@@ -144,12 +144,12 @@ export type WithdrawalRpc = {
|
|
|
144
144
|
amount: QUANTITY;
|
|
145
145
|
};
|
|
146
146
|
/**
|
|
147
|
-
* ExecutionRequestsRpc only holds 3 elements
|
|
147
|
+
* ExecutionRequestsRpc only holds at most 3 elements and no repeated type:
|
|
148
148
|
* - ssz'ed DepositRequests
|
|
149
149
|
* - ssz'ed WithdrawalRequests
|
|
150
150
|
* - ssz'ed ConsolidationRequests
|
|
151
151
|
*/
|
|
152
|
-
export type ExecutionRequestsRpc =
|
|
152
|
+
export type ExecutionRequestsRpc = (DepositRequestsRpc | WithdrawalRequestsRpc | ConsolidationRequestsRpc)[];
|
|
153
153
|
export type DepositRequestsRpc = DATA;
|
|
154
154
|
export type WithdrawalRequestsRpc = DATA;
|
|
155
155
|
export type ConsolidationRequestsRpc = DATA;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { BYTES_PER_FIELD_ELEMENT, BYTES_PER_LOGS_BLOOM, FIELD_ELEMENTS_PER_BLOB, ForkSeq, } from "@lodestar/params";
|
|
1
|
+
import { BYTES_PER_FIELD_ELEMENT, BYTES_PER_LOGS_BLOOM, CONSOLIDATION_REQUEST_TYPE, DEPOSIT_REQUEST_TYPE, FIELD_ELEMENTS_PER_BLOB, ForkSeq, WITHDRAWAL_REQUEST_TYPE, } from "@lodestar/params";
|
|
2
2
|
import { ssz } from "@lodestar/types";
|
|
3
3
|
import { bytesToData, dataToBytes, numToQuantity, quantityToBigint, quantityToNum, } from "../../eth1/provider/utils.js";
|
|
4
|
+
import { isExecutionRequestType, } from "./interface.js";
|
|
4
5
|
export function serializeExecutionPayload(fork, data) {
|
|
5
6
|
const payload = {
|
|
6
7
|
parentHash: bytesToData(data.parentHash),
|
|
@@ -156,20 +157,32 @@ export function deserializeWithdrawal(serialized) {
|
|
|
156
157
|
amount: quantityToBigint(serialized.amount),
|
|
157
158
|
};
|
|
158
159
|
}
|
|
160
|
+
/**
|
|
161
|
+
* Prepend a single-byte requestType to requestsBytes
|
|
162
|
+
*/
|
|
163
|
+
function prefixRequests(requestsBytes, requestType) {
|
|
164
|
+
const prefixedRequests = new Uint8Array(1 + requestsBytes.length);
|
|
165
|
+
prefixedRequests[0] = requestType;
|
|
166
|
+
prefixedRequests.set(requestsBytes, 1);
|
|
167
|
+
return prefixedRequests;
|
|
168
|
+
}
|
|
159
169
|
function serializeDepositRequests(depositRequests) {
|
|
160
|
-
|
|
170
|
+
const requestsBytes = ssz.electra.DepositRequests.serialize(depositRequests);
|
|
171
|
+
return bytesToData(prefixRequests(requestsBytes, DEPOSIT_REQUEST_TYPE));
|
|
161
172
|
}
|
|
162
173
|
function deserializeDepositRequests(serialized) {
|
|
163
174
|
return ssz.electra.DepositRequests.deserialize(dataToBytes(serialized, null));
|
|
164
175
|
}
|
|
165
176
|
function serializeWithdrawalRequests(withdrawalRequests) {
|
|
166
|
-
|
|
177
|
+
const requestsBytes = ssz.electra.WithdrawalRequests.serialize(withdrawalRequests);
|
|
178
|
+
return bytesToData(prefixRequests(requestsBytes, WITHDRAWAL_REQUEST_TYPE));
|
|
167
179
|
}
|
|
168
|
-
function
|
|
180
|
+
function deserializeWithdrawalRequests(serialized) {
|
|
169
181
|
return ssz.electra.WithdrawalRequests.deserialize(dataToBytes(serialized, null));
|
|
170
182
|
}
|
|
171
183
|
function serializeConsolidationRequests(consolidationRequests) {
|
|
172
|
-
|
|
184
|
+
const requestsBytes = ssz.electra.ConsolidationRequests.serialize(consolidationRequests);
|
|
185
|
+
return bytesToData(prefixRequests(requestsBytes, CONSOLIDATION_REQUEST_TYPE));
|
|
173
186
|
}
|
|
174
187
|
function deserializeConsolidationRequests(serialized) {
|
|
175
188
|
return ssz.electra.ConsolidationRequests.deserialize(dataToBytes(serialized, null));
|
|
@@ -180,19 +193,58 @@ function deserializeConsolidationRequests(serialized) {
|
|
|
180
193
|
*/
|
|
181
194
|
export function serializeExecutionRequests(executionRequests) {
|
|
182
195
|
const { deposits, withdrawals, consolidations } = executionRequests;
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
196
|
+
const result = [];
|
|
197
|
+
if (deposits.length !== 0) {
|
|
198
|
+
result.push(serializeDepositRequests(deposits));
|
|
199
|
+
}
|
|
200
|
+
if (withdrawals.length !== 0) {
|
|
201
|
+
result.push(serializeWithdrawalRequests(withdrawals));
|
|
202
|
+
}
|
|
203
|
+
if (consolidations.length !== 0) {
|
|
204
|
+
result.push(serializeConsolidationRequests(consolidations));
|
|
205
|
+
}
|
|
206
|
+
return result;
|
|
188
207
|
}
|
|
189
208
|
export function deserializeExecutionRequests(serialized) {
|
|
190
|
-
const
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
consolidations: deserializeConsolidationRequests(consolidations),
|
|
209
|
+
const result = {
|
|
210
|
+
deposits: [],
|
|
211
|
+
withdrawals: [],
|
|
212
|
+
consolidations: [],
|
|
195
213
|
};
|
|
214
|
+
if (serialized.length === 0) {
|
|
215
|
+
return result;
|
|
216
|
+
}
|
|
217
|
+
let prevRequestType;
|
|
218
|
+
for (let prefixedRequests of serialized) {
|
|
219
|
+
// Slice out 0x so it is easier to extract request type
|
|
220
|
+
if (prefixedRequests.startsWith("0x")) {
|
|
221
|
+
prefixedRequests = prefixedRequests.slice(2);
|
|
222
|
+
}
|
|
223
|
+
const currentRequestType = parseInt(prefixedRequests.substring(0, 2), 16);
|
|
224
|
+
if (!isExecutionRequestType(currentRequestType)) {
|
|
225
|
+
throw Error(`Invalid request type currentRequestType=${prefixedRequests.substring(0, 2)}`);
|
|
226
|
+
}
|
|
227
|
+
const requests = prefixedRequests.slice(2);
|
|
228
|
+
if (prevRequestType !== undefined && prevRequestType >= currentRequestType) {
|
|
229
|
+
throw Error(`Current request type must be larger than previous request type prevRequestType=${prevRequestType} currentRequestType=${currentRequestType}`);
|
|
230
|
+
}
|
|
231
|
+
switch (currentRequestType) {
|
|
232
|
+
case DEPOSIT_REQUEST_TYPE: {
|
|
233
|
+
result.deposits = deserializeDepositRequests(requests);
|
|
234
|
+
break;
|
|
235
|
+
}
|
|
236
|
+
case WITHDRAWAL_REQUEST_TYPE: {
|
|
237
|
+
result.withdrawals = deserializeWithdrawalRequests(requests);
|
|
238
|
+
break;
|
|
239
|
+
}
|
|
240
|
+
case CONSOLIDATION_REQUEST_TYPE: {
|
|
241
|
+
result.consolidations = deserializeConsolidationRequests(requests);
|
|
242
|
+
break;
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
prevRequestType = currentRequestType;
|
|
246
|
+
}
|
|
247
|
+
return result;
|
|
196
248
|
}
|
|
197
249
|
export function deserializeExecutionPayloadBody(data) {
|
|
198
250
|
return data
|