diff --git a/modules/lnd.nix b/modules/lnd.nix index 712d3d0..9e80bc8 100644 --- a/modules/lnd.nix +++ b/modules/lnd.nix @@ -100,33 +100,31 @@ in { sleep 5 - if [ ! -f /secrets/lnd-seed-mnemonic ] - then + if [[ ! -f /secrets/lnd-seed-mnemonic ]]; then echo Creating lnd seed ${pkgs.curl}/bin/curl -s \ - --cacert /secrets/lnd_cert \ - -X GET https://127.0.0.1:8080/v1/genseed | ${pkgs.jq}/bin/jq -c '.cipher_seed_mnemonic' > /secrets/lnd-seed-mnemonic + --cacert /secrets/lnd_cert \ + -X GET https://127.0.0.1:8080/v1/genseed | ${pkgs.jq}/bin/jq -c '.cipher_seed_mnemonic' > /secrets/lnd-seed-mnemonic fi - if [ ! -f ${cfg.dataDir}/chain/bitcoin/mainnet/wallet.db ] - then + if [[ ! -f ${cfg.dataDir}/chain/bitcoin/mainnet/wallet.db ]]; then echo Creating lnd wallet ${pkgs.curl}/bin/curl -s \ - --cacert /secrets/lnd_cert \ - -X POST -d "{\"wallet_password\": \"$(cat /secrets/lnd-wallet-password | tr -d '\n' |base64 -w0)\", \ - \"cipher_seed_mnemonic\": $(cat /secrets/lnd-seed-mnemonic | tr -d '\n')}" \ - https://127.0.0.1:8080/v1/initwallet + --cacert /secrets/lnd_cert \ + -X POST -d "{\"wallet_password\": \"$(cat /secrets/lnd-wallet-password | tr -d '\n' |base64 -w0)\", \ + \"cipher_seed_mnemonic\": $(cat /secrets/lnd-seed-mnemonic | tr -d '\n')}" \ + https://127.0.0.1:8080/v1/initwallet else echo Unlocking lnd wallet ${pkgs.curl}/bin/curl -s \ - -H "Grpc-Metadata-macaroon: $(${pkgs.xxd}/bin/xxd -ps -u -c 99999 ${cfg.dataDir}/chain/bitcoin/mainnet/admin.macaroon)" \ - --cacert /secrets/lnd_cert \ - -X POST \ - -d "{\"wallet_password\": \"$(cat /secrets/lnd-wallet-password | tr -d '\n' | base64 -w0)\"}" \ - https://127.0.0.1:8080/v1/unlockwallet + -H "Grpc-Metadata-macaroon: $(${pkgs.xxd}/bin/xxd -ps -u -c 99999 ${cfg.dataDir}/chain/bitcoin/mainnet/admin.macaroon)" \ + --cacert /secrets/lnd_cert \ + -X POST \ + -d "{\"wallet_password\": \"$(cat /secrets/lnd-wallet-password | tr -d '\n' | base64 -w0)\"}" \ + https://127.0.0.1:8080/v1/unlockwallet fi ''; };