default mac paths

This commit is contained in:
shocknet-justin 2025-11-26 23:40:25 -05:00
parent 1f119e1419
commit d81f81bf87
2 changed files with 10 additions and 12 deletions

View file

@ -90,15 +90,6 @@ install_lightning_pub() {
mkdir -p "$(dirname "$INSTALL_DIR")" mkdir -p "$(dirname "$INSTALL_DIR")"
mv "$EXTRACT_DIR" "$INSTALL_DIR" mv "$EXTRACT_DIR" "$INSTALL_DIR"
# Create .env with OS-specific LND paths
if [ "$OS" = "Mac" ]; then
cat > "$INSTALL_DIR/.env" <<EOF
LND_ADDRESS=127.0.0.1:10009
LND_CERT_PATH=$HOME/Library/Application Support/Lnd/tls.cert
LND_MACAROON_PATH=$HOME/Library/Application Support/Lnd/data/chain/bitcoin/mainnet/admin.macaroon
LND_LOG_DIR=$HOME/Library/Application Support/Lnd/logs/bitcoin/mainnet
EOF
fi
fi fi

View file

@ -95,18 +95,25 @@ const resolveHome = (filepath: string) => {
return path.join(homeDir, filepath); return path.join(homeDir, filepath);
} }
const lndDir = () => {
if (os.platform() === 'darwin') {
return path.join(os.homedir(), 'Library', 'Application Support', 'Lnd');
}
return resolveHome('/.lnd');
}
export const LoadLndNodeSettingsFromEnv = (dbEnv: Record<string, string | undefined>, addToDb?: EnvCacher): LndNodeSettings => { export const LoadLndNodeSettingsFromEnv = (dbEnv: Record<string, string | undefined>, addToDb?: EnvCacher): LndNodeSettings => {
return { return {
lndAddr: chooseEnv('LND_ADDRESS', dbEnv, "127.0.0.1:10009", addToDb), lndAddr: chooseEnv('LND_ADDRESS', dbEnv, "127.0.0.1:10009", addToDb),
lndCertPath: chooseEnv('LND_CERT_PATH', dbEnv, resolveHome("/.lnd/tls.cert"), addToDb), lndCertPath: chooseEnv('LND_CERT_PATH', dbEnv, path.join(lndDir(), "tls.cert"), addToDb),
lndMacaroonPath: chooseEnv('LND_MACAROON_PATH', dbEnv, resolveHome("/.lnd/data/chain/bitcoin/mainnet/admin.macaroon"), addToDb), lndMacaroonPath: chooseEnv('LND_MACAROON_PATH', dbEnv, path.join(lndDir(), "data", "chain", "bitcoin", "mainnet", "admin.macaroon"), addToDb),
} }
} }
export const LoadLndSettingsFromEnv = (dbEnv: Record<string, string | undefined>, addToDb?: EnvCacher): LndSettings => { export const LoadLndSettingsFromEnv = (dbEnv: Record<string, string | undefined>, addToDb?: EnvCacher): LndSettings => {
const feeRateBps: number = chooseEnvInt('OUTBOUND_MAX_FEE_BPS', dbEnv, 60, addToDb) const feeRateBps: number = chooseEnvInt('OUTBOUND_MAX_FEE_BPS', dbEnv, 60, addToDb)
return { return {
lndLogDir: chooseEnv('LND_LOG_DIR', dbEnv, resolveHome("/.lnd/logs/bitcoin/mainnet/lnd.log"), addToDb), lndLogDir: chooseEnv('LND_LOG_DIR', dbEnv, path.join(lndDir(), "logs", "bitcoin", "mainnet", "lnd.log"), addToDb),
feeRateBps: feeRateBps, feeRateBps: feeRateBps,
feeRateLimit: feeRateBps / 10000, feeRateLimit: feeRateBps / 10000,
feeFixedLimit: chooseEnvInt('OUTBOUND_MAX_FEE_EXTRA_SATS', dbEnv, 100, addToDb), feeFixedLimit: chooseEnvInt('OUTBOUND_MAX_FEE_EXTRA_SATS', dbEnv, 100, addToDb),