@lodestar/logger 1.51.0-dev.2593063a82 → 1.51.0-dev.2b933d3b9a

package/lib/interface.d.ts

@@ -12,6 +12,8 @@ export type EpochSlotOpts = {
     genesisTime: number;
     secondsPerSlot: number;
     slotsPerEpoch: number;
+    /** Slot durations by activation epoch, ascending */
+    slotDurations?: [epoch: number, secondsPerSlot: number][];
 };
 export declare enum TimestampFormatCode {
     DateRegular = "regular",

package/lib/interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,OAAO,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAEtE,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAC,CAAC;AAClC,YAAY,EAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAC,CAAC;AAE1C,eAAO,MAAM,WAAW,EAAE;KAAE,CAAC,IAAI,QAAQ,GAAG,MAAM;CAQjD,CAAC;AAEF,eAAO,MAAM,SAAS,YAA0B,CAAC;AAEjD,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC;AACzC,eAAO,MAAM,UAAU,EAAE,SAAS,EAAsB,CAAC;AAEzD,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AACF,oBAAY,mBAAmB;IAC7B,WAAW,YAAY;IACvB,MAAM,WAAW;IACjB,SAAS,UAAU;CACpB;AACD,MAAM,MAAM,eAAe,GACvB;IAAC,MAAM,EAAE,mBAAmB,CAAC,WAAW,CAAA;CAAC,GACzC;IAAC,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAA;CAAC,GACpC,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAC,SAAS,CAAA;CAAC,GAAG,aAAa,CAAC,CAAC;AAE9D,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;IAClB,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CACnB"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,OAAO,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAEtE,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAC,CAAC;AAClC,YAAY,EAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAC,CAAC;AAE1C,eAAO,MAAM,WAAW,EAAE;KAAE,CAAC,IAAI,QAAQ,GAAG,MAAM;CAQjD,CAAC;AAEF,eAAO,MAAM,SAAS,YAA0B,CAAC;AAEjD,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC;AACzC,eAAO,MAAM,UAAU,EAAE,SAAS,EAAsB,CAAC;AAEzD,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oDAAoD;IACpD,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,CAAC;CAC3D,CAAC;AACF,oBAAY,mBAAmB;IAC7B,WAAW,YAAY;IACvB,MAAM,WAAW;IACjB,SAAS,UAAU;CACpB;AACD,MAAM,MAAM,eAAe,GACvB;IAAC,MAAM,EAAE,mBAAmB,CAAC,WAAW,CAAA;CAAC,GACzC;IAAC,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAA;CAAC,GACpC,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAC,SAAS,CAAA;CAAC,GAAG,aAAa,CAAC,CAAC;AAE9D,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;IAClB,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CACnB"}

package/lib/interface.js.map

@@ -1 +1 @@
-{"version":3,"file":"interface.js","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,OAAO,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAsB,QAAQ,EAAS,MAAM,iBAAiB,CAAC;AAEtE,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAC,CAAC;AAGlC,MAAM,CAAC,MAAM,WAAW,GAA8B;IACpD,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IACnB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IAClB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IAClB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IACrB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IACnB,iFAAiF;IACjF,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAGjD,MAAM,CAAC,MAAM,UAAU,GAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAOzD,MAAM,CAAN,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC7B,8CAAuB,CAAA;IACvB,wCAAiB,CAAA;IACjB,0CAAmB,CAAA;AACrB,CAAC,EAJW,mBAAmB,KAAnB,mBAAmB,QAI9B"}
+{"version":3,"file":"interface.js","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,OAAO,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAsB,QAAQ,EAAS,MAAM,iBAAiB,CAAC;AAEtE,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAC,CAAC;AAGlC,MAAM,CAAC,MAAM,WAAW,GAA8B;IACpD,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IACnB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IAClB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IAClB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;IACrB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IACnB,iFAAiF;IACjF,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAGjD,MAAM,CAAC,MAAM,UAAU,GAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AASzD,MAAM,CAAN,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC7B,8CAAuB,CAAA;IACvB,wCAAiB,CAAA;IACjB,0CAAmB,CAAA;AACrB,CAAC,EAJW,mBAAmB,KAAnB,mBAAmB,QAI9B"}

package/lib/utils/timeFormat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timeFormat.d.ts","sourceRoot":"","sources":["../../src/utils/timeFormat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,SAAa,GAAG,MAAM,CASjF"}
+{"version":3,"file":"timeFormat.d.ts","sourceRoot":"","sources":["../../src/utils/timeFormat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,SAAa,GAAG,MAAM,CAkBjF"}

package/lib/utils/timeFormat.js

@@ -3,12 +3,22 @@
  */
 export function formatEpochSlotTime(opts, now = Date.now()) {
     const nowSec = now / 1000;
-    const secSinceGenesis = nowSec - opts.genesisTime;
-    const epoch = Math.floor(secSinceGenesis / (opts.slotsPerEpoch * opts.secondsPerSlot));
-    const epochStartSec = opts.genesisTime + epoch * opts.slotsPerEpoch * opts.secondsPerSlot;
-    const secSinceStartEpoch = nowSec - epochStartSec;
-    const slotIndex = Math.floor(secSinceStartEpoch / opts.secondsPerSlot);
-    const slotSec = secSinceStartEpoch % opts.secondsPerSlot;
+    let eraStartSlot = 0;
+    let eraStartSec = opts.genesisTime;
+    let secondsPerSlot = opts.secondsPerSlot;
+    for (const [forkEpoch, forkSecondsPerSlot] of opts.slotDurations ?? []) {
+        const forkSlot = forkEpoch * opts.slotsPerEpoch;
+        const forkSec = eraStartSec + (forkSlot - eraStartSlot) * secondsPerSlot;
+        if (nowSec < forkSec)
+            break;
+        eraStartSlot = forkSlot;
+        eraStartSec = forkSec;
+        secondsPerSlot = forkSecondsPerSlot;
+    }
+    const slot = eraStartSlot + Math.floor((nowSec - eraStartSec) / secondsPerSlot);
+    const epoch = Math.floor(slot / opts.slotsPerEpoch);
+    const slotIndex = slot - epoch * opts.slotsPerEpoch;
+    const slotSec = nowSec - (eraStartSec + (slot - eraStartSlot) * secondsPerSlot);
     return `Eph ${epoch}/${slotIndex} ${slotSec.toFixed(3)}`;
 }
 //# sourceMappingURL=timeFormat.js.map

package/lib/utils/timeFormat.js.map

@@ -1 +1 @@
-{"version":3,"file":"timeFormat.js","sourceRoot":"","sources":["../../src/utils/timeFormat.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAmB,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IACvE,MAAM,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC;IAC1B,MAAM,eAAe,GAAG,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC;IAClD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;IACvF,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,GAAG,KAAK,GAAG,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC;IAC1F,MAAM,kBAAkB,GAAG,MAAM,GAAG,aAAa,CAAC;IAClD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC;IACzD,OAAO,OAAO,KAAK,IAAI,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;AAC3D,CAAC"}
+{"version":3,"file":"timeFormat.js","sourceRoot":"","sources":["../../src/utils/timeFormat.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAmB,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IACvE,MAAM,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC;IAC1B,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;IACnC,IAAI,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;IACzC,KAAK,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,IAAI,IAAI,CAAC,aAAa,IAAI,EAAE,EAAE,CAAC;QACvE,MAAM,QAAQ,GAAG,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC;QAChD,MAAM,OAAO,GAAG,WAAW,GAAG,CAAC,QAAQ,GAAG,YAAY,CAAC,GAAG,cAAc,CAAC;QACzE,IAAI,MAAM,GAAG,OAAO;YAAE,MAAM;QAC5B,YAAY,GAAG,QAAQ,CAAC;QACxB,WAAW,GAAG,OAAO,CAAC;QACtB,cAAc,GAAG,kBAAkB,CAAC;IACtC,CAAC;IACD,MAAM,IAAI,GAAG,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,WAAW,CAAC,GAAG,cAAc,CAAC,CAAC;IAChF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC;IACpD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,WAAW,GAAG,CAAC,IAAI,GAAG,YAAY,CAAC,GAAG,cAAc,CAAC,CAAC;IAChF,OAAO,OAAO,KAAK,IAAI,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;AAC3D,CAAC"}

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.51.0-dev.2593063a82",
+  "version": "1.51.0-dev.2b933d3b9a",
   "type": "module",
   "exports": {
     ".": {
@@ -67,7 +67,7 @@
   },
   "types": "lib/index.d.ts",
   "dependencies": {
-    "@lodestar/utils": "^1.51.0-dev.2593063a82",
+    "@lodestar/utils": "^1.51.0-dev.2b933d3b9a",
     "triple-beam": "^1.3.0",
     "winston": "^3.8.2",
     "winston-daily-rotate-file": "^4.7.1",
@@ -76,7 +76,7 @@
   "devDependencies": {
     "@chainsafe/ssz": "^1.8.1",
     "@chainsafe/threads": "^1.11.3",
-    "@lodestar/test-utils": "^1.51.0-dev.2593063a82",
+    "@lodestar/test-utils": "^1.51.0-dev.2b933d3b9a",
     "@types/triple-beam": "^1.3.2"
   },
   "keywords": [
@@ -85,5 +85,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "9ef629e5938036e197e32f9dd5c99eeeb89a9e48"
+  "gitHead": "a052574f95ae3cd10608f7acd46f680792604377"
 }

package/src/interface.ts

@@ -23,6 +23,8 @@ export type EpochSlotOpts = {
   genesisTime: number;
   secondsPerSlot: number;
   slotsPerEpoch: number;
+  /** Slot durations by activation epoch, ascending */
+  slotDurations?: [epoch: number, secondsPerSlot: number][];
 };
 export enum TimestampFormatCode {
   DateRegular = "regular",

package/src/utils/timeFormat.ts

@@ -5,11 +5,20 @@ import {EpochSlotOpts} from "../interface.js";
  */
 export function formatEpochSlotTime(opts: EpochSlotOpts, now = Date.now()): string {
   const nowSec = now / 1000;
-  const secSinceGenesis = nowSec - opts.genesisTime;
-  const epoch = Math.floor(secSinceGenesis / (opts.slotsPerEpoch * opts.secondsPerSlot));
-  const epochStartSec = opts.genesisTime + epoch * opts.slotsPerEpoch * opts.secondsPerSlot;
-  const secSinceStartEpoch = nowSec - epochStartSec;
-  const slotIndex = Math.floor(secSinceStartEpoch / opts.secondsPerSlot);
-  const slotSec = secSinceStartEpoch % opts.secondsPerSlot;
+  let eraStartSlot = 0;
+  let eraStartSec = opts.genesisTime;
+  let secondsPerSlot = opts.secondsPerSlot;
+  for (const [forkEpoch, forkSecondsPerSlot] of opts.slotDurations ?? []) {
+    const forkSlot = forkEpoch * opts.slotsPerEpoch;
+    const forkSec = eraStartSec + (forkSlot - eraStartSlot) * secondsPerSlot;
+    if (nowSec < forkSec) break;
+    eraStartSlot = forkSlot;
+    eraStartSec = forkSec;
+    secondsPerSlot = forkSecondsPerSlot;
+  }
+  const slot = eraStartSlot + Math.floor((nowSec - eraStartSec) / secondsPerSlot);
+  const epoch = Math.floor(slot / opts.slotsPerEpoch);
+  const slotIndex = slot - epoch * opts.slotsPerEpoch;
+  const slotSec = nowSec - (eraStartSec + (slot - eraStartSlot) * secondsPerSlot);
   return `Eph ${epoch}/${slotIndex} ${slotSec.toFixed(3)}`;
 }