@chainsafe/lodestar 1.15.0 → 1.15.1-rc.0

package/.git-data.json

@@ -1,4 +1,4 @@
 {
   "branch": "HEAD",
-  "commit": "5d93a629c0fd1fdd32160cbf7717e7a6b22f7f2d"
+  "commit": "6981e0f787c710279fd4d88f57ba05d94e3d9c0e"
 }

package/lib/util/lockfile.d.ts

@@ -1,7 +1,3 @@
-export type Lockfile = {
-    lockSync(path: string): void;
-    unlockSync(path: string): void;
-};
 /**
  * Creates a .lock file for `filepath`, argument passed must not be the lock path
  * @param filepath File to lock, i.e. `keystore_0001.json`
@@ -12,4 +8,7 @@ export declare function lockFilepath(filepath: string): void;
  * @param filepath File to unlock, i.e. `keystore_0001.json`
  */
 export declare function unlockFilepath(filepath: string): void;
+export type LockfileError = Error & {
+    code: "ELOCKED" | "ENOTACQUIRED";
+};
 //# sourceMappingURL=lockfile.d.ts.map

package/lib/util/lockfile.js

@@ -1,29 +1,42 @@
-const lockFile = (await import("lockfile"));
-function getLockFilepath(filepath) {
-    return `${filepath}.lock`;
-}
-/**
- * When lockfile is imported, it registers listeners to process
- * Since it's only used by the validator client, require lazily to not pollute
- * beacon_node client context
- */
-function getLockFile() {
-    return lockFile;
-}
+import { lockSync, unlockSync } from "proper-lockfile";
 /**
  * Creates a .lock file for `filepath`, argument passed must not be the lock path
  * @param filepath File to lock, i.e. `keystore_0001.json`
  */
 export function lockFilepath(filepath) {
-    getLockFile().lockSync(getLockFilepath(filepath));
+    try {
+        lockSync(filepath, {
+            // Allows to lock files that do not exist
+            realpath: false,
+        });
+    }
+    catch (e) {
+        if (isLockfileError(e) && e.code === "ELOCKED") {
+            e.message = `${filepath} is already in use by another process`;
+        }
+        throw e;
+    }
 }
 /**
  * Deletes a .lock file for `filepath`, argument passed must not be the lock path
  * @param filepath File to unlock, i.e. `keystore_0001.json`
  */
 export function unlockFilepath(filepath) {
-    // Does not throw if the lock file is already deleted
-    // https://github.com/npm/lockfile/blob/6590779867ee9bdc5dbebddc962640759892bb91/lockfile.js#L68
-    getLockFile().unlockSync(getLockFilepath(filepath));
+    try {
+        unlockSync(filepath, {
+            // Allows to unlock files that do not exist
+            realpath: false,
+        });
+    }
+    catch (e) {
+        if (isLockfileError(e) && e.code === "ENOTACQUIRED") {
+            // Do not throw if the lock file is already deleted
+            return;
+        }
+        throw e;
+    }
+}
+function isLockfileError(e) {
+    return e instanceof Error && e.code !== undefined;
 }
 //# sourceMappingURL=lockfile.js.map

package/lib/util/lockfile.js.map

@@ -1 +1 @@
-{"version":3,"file":"lockfile.js","sourceRoot":"","sources":["../../src/util/lockfile.ts"],"names":[],"mappings":"AAKA,MAAM,QAAQ,GAAa,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,CAAa,CAAC;AAElE,SAAS,eAAe,CAAC,QAAgB;IACvC,OAAO,GAAG,QAAQ,OAAO,CAAC;AAC5B,CAAC;AAED;;;;GAIG;AACH,SAAS,WAAW;IAClB,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,QAAgB;IAC3C,WAAW,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;AACpD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,qDAAqD;IACrD,gGAAgG;IAChG,WAAW,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"lockfile.js","sourceRoot":"","sources":["../../src/util/lockfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAErD;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,QAAgB;IAC3C,IAAI;QACF,QAAQ,CAAC,QAAQ,EAAE;YACjB,yCAAyC;YACzC,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;KACJ;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE;YAC9C,CAAC,CAAC,OAAO,GAAG,GAAG,QAAQ,uCAAuC,CAAC;SAChE;QACD,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,IAAI;QACF,UAAU,CAAC,QAAQ,EAAE;YACnB,2CAA2C;YAC3C,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;KACJ;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,cAAc,EAAE;YACnD,mDAAmD;YACnD,OAAO;SACR;QACD,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAKD,SAAS,eAAe,CAAC,CAAU;IACjC,OAAO,CAAC,YAAY,KAAK,IAAK,CAAmB,CAAC,IAAI,KAAK,SAAS,CAAC;AACvE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar",
-  "version": "1.15.0",
+  "version": "1.15.1-rc.0",
   "description": "Command line interface for lodestar",
   "author": "ChainSafe Systems",
   "license": "LGPL-3.0",
@@ -66,19 +66,18 @@
     "@libp2p/crypto": "^3.0.4",
     "@libp2p/peer-id": "^4.0.4",
     "@libp2p/peer-id-factory": "^4.0.3",
-    "@lodestar/api": "^1.15.0",
-    "@lodestar/beacon-node": "^1.15.0",
-    "@lodestar/config": "^1.15.0",
-    "@lodestar/db": "^1.15.0",
-    "@lodestar/light-client": "^1.15.0",
-    "@lodestar/logger": "^1.15.0",
-    "@lodestar/params": "^1.15.0",
-    "@lodestar/state-transition": "^1.15.0",
-    "@lodestar/types": "^1.15.0",
-    "@lodestar/utils": "^1.15.0",
-    "@lodestar/validator": "^1.15.0",
+    "@lodestar/api": "1.15.1-rc.0",
+    "@lodestar/beacon-node": "1.15.1-rc.0",
+    "@lodestar/config": "1.15.1-rc.0",
+    "@lodestar/db": "1.15.1-rc.0",
+    "@lodestar/light-client": "1.15.1-rc.0",
+    "@lodestar/logger": "1.15.1-rc.0",
+    "@lodestar/params": "1.15.1-rc.0",
+    "@lodestar/state-transition": "1.15.1-rc.0",
+    "@lodestar/types": "1.15.1-rc.0",
+    "@lodestar/utils": "1.15.1-rc.0",
+    "@lodestar/validator": "1.15.1-rc.0",
     "@multiformats/multiaddr": "^12.1.3",
-    "@types/lockfile": "^1.0.2",
     "bip39": "^3.1.0",
     "deepmerge": "^4.3.1",
     "ethers": "^6.7.0",
@@ -87,9 +86,9 @@
     "got": "^11.8.6",
     "inquirer": "^9.1.5",
     "js-yaml": "^4.1.0",
-    "lockfile": "^1.0.4",
     "lodash": "^4.17.21",
     "prom-client": "^15.1.0",
+    "proper-lockfile": "^4.1.2",
     "rimraf": "^4.4.1",
     "source-map-support": "^0.5.21",
     "uint8arrays": "^4.0.9",
@@ -97,13 +96,14 @@
     "yargs": "^17.7.1"
   },
   "devDependencies": {
-    "@lodestar/test-utils": "^1.15.0",
+    "@lodestar/test-utils": "1.15.1-rc.0",
     "@types/debug": "^4.1.7",
     "@types/expand-tilde": "^2.0.0",
     "@types/got": "^9.6.12",
     "@types/inquirer": "^9.0.3",
     "@types/lodash": "^4.14.192",
+    "@types/proper-lockfile": "^4.1.4",
     "@types/yargs": "^17.0.24"
   },
-  "gitHead": "5d93a629c0fd1fdd32160cbf7717e7a6b22f7f2d"
+  "gitHead": "fe2b799f4c9113bd76ba20e7b74bdf55841e22c4"
 }