@economicagents/keystore 0.1.0 → 0.2.0

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAuB,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAwD5E,MAAM,MAAM,YAAY,GAAG;IAAE,OAAO,EAAE,iBAAiB,CAAC;IAAC,UAAU,EAAE,KAAK,MAAM,EAAE,CAAA;CAAE,CAAC;AAErF,wBAAsB,gBAAgB,CAAC,mBAAmB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CA6B1F;AAED,wBAAgB,oBAAoB,CAAC,mBAAmB,CAAC,EAAE,MAAM,GAAG,YAAY,CAqC/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAuB,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AA+E5E,MAAM,MAAM,YAAY,GAAG;IAAE,OAAO,EAAE,iBAAiB,CAAC;IAAC,UAAU,EAAE,KAAK,MAAM,EAAE,CAAA;CAAE,CAAC;AAErF,wBAAsB,gBAAgB,CAAC,mBAAmB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CA6B1F;AAED,wBAAgB,oBAAoB,CAAC,mBAAmB,CAAC,EAAE,MAAM,GAAG,YAAY,CAkC/E"}

package/dist/index.js

@@ -10,6 +10,29 @@ import { privateKeyToAccount } from "viem/accounts";
 const DEFAULT_KEYSTORE_DIR = join(homedir(), ".foundry", "keystores");
 const PRIVATE_KEY_WARNING = "Warning: PRIVATE_KEY in .env is insecure. Prefer: cast wallet import aep --interactive, then set AEP_KEYSTORE_ACCOUNT=aep";
 let privateKeyWarningEmitted = false;
+function readPasswordFromFile(filePath) {
+    const normalized = filePath.trim();
+    if (!normalized || normalized.includes("\0") || normalized.split(/[/\\]/).includes("..")) {
+        throw new Error("Invalid keystore password file path");
+    }
+    const raw = readFileSync(normalized, "utf-8");
+    const line = raw.replace(/\r?\n$/, "").trim();
+    if (!line) {
+        throw new Error("Keystore password file is empty");
+    }
+    return line;
+}
+/** Password from AEP_KEYSTORE_PASSWORD_FILE, then FOUNDRY_PASSWORD / AEP_KEYSTORE_PASSWORD / ETH_KEYSTORE_PASSWORD */
+function keystorePasswordFromEnv() {
+    const pwdFile = process.env.AEP_KEYSTORE_PASSWORD_FILE?.trim();
+    if (pwdFile) {
+        return readPasswordFromFile(pwdFile);
+    }
+    const pw = process.env.FOUNDRY_PASSWORD ??
+        process.env.AEP_KEYSTORE_PASSWORD ??
+        process.env.ETH_KEYSTORE_PASSWORD;
+    return pw?.trim() ? pw : undefined;
+}
 function resolveKeystorePath(accountName) {
     const explicitPath = process.env.AEP_KEYSTORE_PATH;
     if (explicitPath && existsSync(explicitPath)) {
@@ -37,9 +60,7 @@ function resolveKeystorePath(accountName) {
     return null;
 }
 async function getPassword() {
-    const pw = process.env.FOUNDRY_PASSWORD ??
-        process.env.AEP_KEYSTORE_PASSWORD ??
-        process.env.ETH_KEYSTORE_PASSWORD;
+    const pw = keystorePasswordFromEnv();
     if (pw)
         return pw;
     if (process.stdin.isTTY) {
@@ -52,7 +73,7 @@ async function getPassword() {
             });
         });
     }
-    throw new Error("Keystore password required. Set FOUNDRY_PASSWORD or AEP_KEYSTORE_PASSWORD, or run interactively.");
+    throw new Error("Keystore password required. Set AEP_KEYSTORE_PASSWORD_FILE, FOUNDRY_PASSWORD, or AEP_KEYSTORE_PASSWORD, or run interactively.");
 }
 export async function getSignerAccount(accountNameOverride) {
     const accountName = accountNameOverride ??
@@ -86,11 +107,9 @@ export function getSignerAccountSync(accountNameOverride) {
     const keystorePath = resolveKeystorePath(accountName);
     if (keystorePath) {
         const json = readFileSync(keystorePath, "utf-8");
-        const password = process.env.FOUNDRY_PASSWORD ??
-            process.env.AEP_KEYSTORE_PASSWORD ??
-            process.env.ETH_KEYSTORE_PASSWORD;
+        const password = keystorePasswordFromEnv();
         if (!password) {
-            throw new Error("Keystore password required. Set FOUNDRY_PASSWORD or AEP_KEYSTORE_PASSWORD for non-interactive use.");
+            throw new Error("Keystore password required. Set AEP_KEYSTORE_PASSWORD_FILE, FOUNDRY_PASSWORD, or AEP_KEYSTORE_PASSWORD for non-interactive use.");
         }
         const wallet = Wallet.fromEncryptedJsonSync(json, password);
         const pk = (wallet.privateKey.startsWith("0x") ? wallet.privateKey : `0x${wallet.privateKey}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@economicagents/keystore",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Foundry keystore signer resolver for AEP",
   "license": "Apache-2.0",
   "repository": {
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "ethers": "^6.13.0",
-    "viem": "^2.21.0"
+    "viem": "^2.47.5"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",