diff --git a/.env b/.env index dd3d6f96ac..3857778ad8 100644 --- a/.env +++ b/.env @@ -19,16 +19,6 @@ export MACAROONOUTSIDE1="AgEDbG5kAvgBAwoQeE+5exgz7/0ExCn7H6AJlBIBMBoWCgdhZGRyZXN # dev/lnd/regtest/lnd-outside-2.admin.macaroon.base64 export MACAROONOUTSIDE2="AgEDbG5kAvgBAwoQfKO82/iPT2zIwWYPrOXvABIBMBoWCgdhZGRyZXNzEgRyZWFkEgV3cml0ZRoTCgRpbmZvEgRyZWFkEgV3cml0ZRoXCghpbnZvaWNlcxIEcmVhZBIFd3JpdGUaIQoIbWFjYXJvb24SCGdlbmVyYXRlEgRyZWFkEgV3cml0ZRoWCgdtZXNzYWdlEgRyZWFkEgV3cml0ZRoXCghvZmZjaGFpbhIEcmVhZBIFd3JpdGUaFgoHb25jaGFpbhIEcmVhZBIFd3JpdGUaFAoFcGVlcnMSBHJlYWQSBXdyaXRlGhgKBnNpZ25lchIIZ2VuZXJhdGUSBHJlYWQAAAYg2XkV+4Z4inbfXGZivRoY+r7KHNZhgxkCEdKByxbeb/Q=" -# dev/lnd/loop/regtest/loopd1-1.loop.macaroon.base64 -export LND1_LOOP_MACAROON="AgEEbG9vcAJ3AwoQRGymK6/vfF3wwuVmaTj3RhIBMBoMCgRhdXRoEgRyZWFkGg8KBGxvb3ASAmluEgNvdXQaGgoLc3VnZ2VzdGlvbnMSBHJlYWQSBXdyaXRlGhUKBHN3YXASB2V4ZWN1dGUSBHJlYWQaDQoFdGVybXMSBHJlYWQAAAYgAFS/qTZItZ3ZKksQkfXAKFnsb0JS5Ok3Oi5fAgCaE/k=" -# dev/lnd/loop/regtest/loopd2-1.loop.macaroon.base64 -export LND2_LOOP_MACAROON="AgEEbG9vcAJ3AwoQ6Ntr7+DpuicdMgmVPKvDVxIBMBoMCgRhdXRoEgRyZWFkGg8KBGxvb3ASAmluEgNvdXQaGgoLc3VnZ2VzdGlvbnMSBHJlYWQSBXdyaXRlGhUKBHN3YXASB2V4ZWN1dGUSBHJlYWQaDQoFdGVybXMSBHJlYWQAAAYgU6bTJC50AuYehDtb9U2s4EuH7C2Tf8eAppPPOFeUXds=" - -# dev/lnd/loop/regtest/loopd1-1.tls.cert.base64 -export LND1_LOOP_TLS="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNKakNDQWMyZ0F3SUJBZ0lSQU1memVXM0J0UWJaaTdxSjZoQk5vMHN3Q2dZSUtvWkl6ajBFQXdJd09URWcKTUI0R0ExVUVDaE1YYkc5dmNDQmhkWFJ2WjJWdVpYSmhkR1ZrSUdObGNuUXhGVEFUQmdOVkJBTVREREpqWkdRMQpOMlptWlRZeFpEQWVGdzB5TWpBNU1EY3lNVE15TWpSYUZ3MHlNekV4TURJeU1UTXlNalJhTURreElEQWVCZ05WCkJBb1RGMnh2YjNBZ1lYVjBiMmRsYm1WeVlYUmxaQ0JqWlhKME1SVXdFd1lEVlFRREV3d3lZMlJrTlRkbVptVTIKTVdRd1dUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFUcU5qcVFMUGNHSURaSmtHenNlL3d2ZWt0TwpRVlhpaFJ6WmVLay9ZMFlTNDFkejB2TjlQdktaM0ZxTmN2eEN5a1cvZ1dKNWhBdEpCZTdDaTZhWitnR0tvNEcxCk1JR3lNQTRHQTFVZER3RUIvd1FFQXdJQ3BEQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBVEFQQmdOVkhSTUIKQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXQkJRZHJscHQzM2lLdlZUZWQyVnV4Y25uQVJMeTlEQmJCZ05WSFJFRQpWREJTZ2d3eVkyUmtOVGRtWm1VMk1XU0NDV3h2WTJGc2FHOXpkSUlFZFc1cGVJSUtkVzVwZUhCaFkydGxkSUlIClluVm1ZMjl1Ym9jRWZ3QUFBWWNRQUFBQUFBQUFBQUFBQUFBQUFBQUFBWWNFckJzQUR6QUtCZ2dxaGtqT1BRUUQKQWdOSEFEQkVBaUJYaFI2VmRzSFYrREhhWGRrV2VRZ0pzMlRxT0pXajBwUXI1ZHFLcFViNjlBSWdTeGtYYTZFRQpWVk9CZ0VhNXR5Z3NBcGM2bDBSak5nVGF2SkF6T2dWT2tIWT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=" -# dev/lnd/loop/regtest/loopd2-1.tls.cert.base64 -export LND2_LOOP_TLS="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNKakNDQWN5Z0F3SUJBZ0lRVjd2dFlUbzJYS1NybWt6N3d0SjNjVEFLQmdncWhrak9QUVFEQWpBNU1TQXcKSGdZRFZRUUtFeGRzYjI5d0lHRjFkRzluWlc1bGNtRjBaV1FnWTJWeWRERVZNQk1HQTFVRUF4TU1aVEZpTkRobQpZbVUwTmpZek1CNFhEVEl5TURrd056SXhNekl5TlZvWERUSXpNVEV3TWpJeE16SXlOVm93T1RFZ01CNEdBMVVFCkNoTVhiRzl2Y0NCaGRYUnZaMlZ1WlhKaGRHVmtJR05sY25ReEZUQVRCZ05WQkFNVERHVXhZalE0Wm1KbE5EWTIKTXpCWk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQkVYbzlndHpkUnFMTWFhdjJ1VDA4eHlTUUpTKwpoMFNMcUMrdnpzR0RhZ2owOXg3UW9ud3oralo0eHppeklsdWVOY0JlWDYzd3VGZ0dwOTlBMW9mMDQyU2pnYlV3CmdiSXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01CTUdBMVVkSlFRTU1Bb0dDQ3NHQVFVRkJ3TUJNQThHQTFVZEV3RUIKL3dRRk1BTUJBZjh3SFFZRFZSME9CQllFRkZOM2E3WkY5Y2FSUGJnNDJXYitOYnVYM2hTYU1Gc0dBMVVkRVFSVQpNRktDREdVeFlqUTRabUpsTkRZMk00SUpiRzlqWVd4b2IzTjBnZ1IxYm1sNGdncDFibWw0Y0dGamEyVjBnZ2RpCmRXWmpiMjV1aHdSL0FBQUJoeEFBQUFBQUFBQUFBQUFBQUFBQUFBQUJod1NzR3dBUU1Bb0dDQ3FHU000OUJBTUMKQTBnQU1FVUNJUURUcUpnVitReks2N3lSN1lGcWtyQkN6aEQ2OExZcjBBM1JMWFF1ckM2d21BSWdZNGdESjA1eQpRTjJCY2YvaEl6VHJwb1ZlK3Y0blBRREg3bXBFQXRyOE96MD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=" - # dev/lnd/regtest/lnd1.pubkey export LND1_PUBKEY="03ca1907342d5d37744cb7038375e1867c24a87564c293157c95b2a9d38dcfb4c2" # dev/lnd/regtest/lnd2.pubkey diff --git a/.env.ci b/.env.ci index 5958618853..18acc02e1e 100644 --- a/.env.ci +++ b/.env.ci @@ -49,10 +49,6 @@ TWILIO_VERIFY_SERVICE_ID=${TWILIO_VERIFY_SERVICE_ID} COMMITHASH=${COMMITHASH} HELMREVISION=${HELMREVISION} PRICE_SERVER_HOST=stablesats -LND1_LOOP_MACAROON=${LND1_LOOP_MACAROON} -LND2_LOOP_MACAROON=${LND2_LOOP_MACAROON} -LND1_LOOP_TLS=${LND1_LOOP_TLS} -LND2_LOOP_TLS=${LND2_LOOP_TLS} KRATOS_MASTER_USER_PASSWORD=${KRATOS_MASTER_USER_PASSWORD} KRATOS_CALLBACK_API_KEY=${KRATOS_CALLBACK_API_KEY} KRATOS_PUBLIC_API=http://kratos:4433 diff --git a/core/api/.env b/core/api/.env index e33d1ae5e7..b41fb5aa7b 100644 --- a/core/api/.env +++ b/core/api/.env @@ -19,16 +19,6 @@ export MACAROONOUTSIDE1="AgEDbG5kAvgBAwoQeE+5exgz7/0ExCn7H6AJlBIBMBoWCgdhZGRyZXN # dev/lnd/regtest/lnd-outside-2.admin.macaroon.base64 export MACAROONOUTSIDE2="AgEDbG5kAvgBAwoQfKO82/iPT2zIwWYPrOXvABIBMBoWCgdhZGRyZXNzEgRyZWFkEgV3cml0ZRoTCgRpbmZvEgRyZWFkEgV3cml0ZRoXCghpbnZvaWNlcxIEcmVhZBIFd3JpdGUaIQoIbWFjYXJvb24SCGdlbmVyYXRlEgRyZWFkEgV3cml0ZRoWCgdtZXNzYWdlEgRyZWFkEgV3cml0ZRoXCghvZmZjaGFpbhIEcmVhZBIFd3JpdGUaFgoHb25jaGFpbhIEcmVhZBIFd3JpdGUaFAoFcGVlcnMSBHJlYWQSBXdyaXRlGhgKBnNpZ25lchIIZ2VuZXJhdGUSBHJlYWQAAAYg2XkV+4Z4inbfXGZivRoY+r7KHNZhgxkCEdKByxbeb/Q=" -# dev/lnd/loop/regtest/loopd1-1.loop.macaroon.base64 -export LND1_LOOP_MACAROON="AgEEbG9vcAJ3AwoQRGymK6/vfF3wwuVmaTj3RhIBMBoMCgRhdXRoEgRyZWFkGg8KBGxvb3ASAmluEgNvdXQaGgoLc3VnZ2VzdGlvbnMSBHJlYWQSBXdyaXRlGhUKBHN3YXASB2V4ZWN1dGUSBHJlYWQaDQoFdGVybXMSBHJlYWQAAAYgAFS/qTZItZ3ZKksQkfXAKFnsb0JS5Ok3Oi5fAgCaE/k=" -# dev/lnd/loop/regtest/loopd2-1.loop.macaroon.base64 -export LND2_LOOP_MACAROON="AgEEbG9vcAJ3AwoQ6Ntr7+DpuicdMgmVPKvDVxIBMBoMCgRhdXRoEgRyZWFkGg8KBGxvb3ASAmluEgNvdXQaGgoLc3VnZ2VzdGlvbnMSBHJlYWQSBXdyaXRlGhUKBHN3YXASB2V4ZWN1dGUSBHJlYWQaDQoFdGVybXMSBHJlYWQAAAYgU6bTJC50AuYehDtb9U2s4EuH7C2Tf8eAppPPOFeUXds=" - -# dev/lnd/loop/regtest/loopd1-1.tls.cert.base64 -export LND1_LOOP_TLS="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNKakNDQWMyZ0F3SUJBZ0lSQU1memVXM0J0UWJaaTdxSjZoQk5vMHN3Q2dZSUtvWkl6ajBFQXdJd09URWcKTUI0R0ExVUVDaE1YYkc5dmNDQmhkWFJ2WjJWdVpYSmhkR1ZrSUdObGNuUXhGVEFUQmdOVkJBTVREREpqWkdRMQpOMlptWlRZeFpEQWVGdzB5TWpBNU1EY3lNVE15TWpSYUZ3MHlNekV4TURJeU1UTXlNalJhTURreElEQWVCZ05WCkJBb1RGMnh2YjNBZ1lYVjBiMmRsYm1WeVlYUmxaQ0JqWlhKME1SVXdFd1lEVlFRREV3d3lZMlJrTlRkbVptVTIKTVdRd1dUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFUcU5qcVFMUGNHSURaSmtHenNlL3d2ZWt0TwpRVlhpaFJ6WmVLay9ZMFlTNDFkejB2TjlQdktaM0ZxTmN2eEN5a1cvZ1dKNWhBdEpCZTdDaTZhWitnR0tvNEcxCk1JR3lNQTRHQTFVZER3RUIvd1FFQXdJQ3BEQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBVEFQQmdOVkhSTUIKQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXQkJRZHJscHQzM2lLdlZUZWQyVnV4Y25uQVJMeTlEQmJCZ05WSFJFRQpWREJTZ2d3eVkyUmtOVGRtWm1VMk1XU0NDV3h2WTJGc2FHOXpkSUlFZFc1cGVJSUtkVzVwZUhCaFkydGxkSUlIClluVm1ZMjl1Ym9jRWZ3QUFBWWNRQUFBQUFBQUFBQUFBQUFBQUFBQUFBWWNFckJzQUR6QUtCZ2dxaGtqT1BRUUQKQWdOSEFEQkVBaUJYaFI2VmRzSFYrREhhWGRrV2VRZ0pzMlRxT0pXajBwUXI1ZHFLcFViNjlBSWdTeGtYYTZFRQpWVk9CZ0VhNXR5Z3NBcGM2bDBSak5nVGF2SkF6T2dWT2tIWT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=" -# dev/lnd/loop/regtest/loopd2-1.tls.cert.base64 -export LND2_LOOP_TLS="LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNKakNDQWN5Z0F3SUJBZ0lRVjd2dFlUbzJYS1NybWt6N3d0SjNjVEFLQmdncWhrak9QUVFEQWpBNU1TQXcKSGdZRFZRUUtFeGRzYjI5d0lHRjFkRzluWlc1bGNtRjBaV1FnWTJWeWRERVZNQk1HQTFVRUF4TU1aVEZpTkRobQpZbVUwTmpZek1CNFhEVEl5TURrd056SXhNekl5TlZvWERUSXpNVEV3TWpJeE16SXlOVm93T1RFZ01CNEdBMVVFCkNoTVhiRzl2Y0NCaGRYUnZaMlZ1WlhKaGRHVmtJR05sY25ReEZUQVRCZ05WQkFNVERHVXhZalE0Wm1KbE5EWTIKTXpCWk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQkVYbzlndHpkUnFMTWFhdjJ1VDA4eHlTUUpTKwpoMFNMcUMrdnpzR0RhZ2owOXg3UW9ud3oralo0eHppeklsdWVOY0JlWDYzd3VGZ0dwOTlBMW9mMDQyU2pnYlV3CmdiSXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01CTUdBMVVkSlFRTU1Bb0dDQ3NHQVFVRkJ3TUJNQThHQTFVZEV3RUIKL3dRRk1BTUJBZjh3SFFZRFZSME9CQllFRkZOM2E3WkY5Y2FSUGJnNDJXYitOYnVYM2hTYU1Gc0dBMVVkRVFSVQpNRktDREdVeFlqUTRabUpsTkRZMk00SUpiRzlqWVd4b2IzTjBnZ1IxYm1sNGdncDFibWw0Y0dGamEyVjBnZ2RpCmRXWmpiMjV1aHdSL0FBQUJoeEFBQUFBQUFBQUFBQUFBQUFBQUFBQUJod1NzR3dBUU1Bb0dDQ3FHU000OUJBTUMKQTBnQU1FVUNJUURUcUpnVitReks2N3lSN1lGcWtyQkN6aEQ2OExZcjBBM1JMWFF1ckM2d21BSWdZNGdESjA1eQpRTjJCY2YvaEl6VHJwb1ZlK3Y0blBRREg3bXBFQXRyOE96MD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=" - # dev/lnd/regtest/lnd1.pubkey export LND1_PUBKEY="03ca1907342d5d37744cb7038375e1867c24a87564c293157c95b2a9d38dcfb4c2" # dev/lnd/regtest/lnd2.pubkey diff --git a/core/api/.env.ci b/core/api/.env.ci index 5958618853..18acc02e1e 100644 --- a/core/api/.env.ci +++ b/core/api/.env.ci @@ -49,10 +49,6 @@ TWILIO_VERIFY_SERVICE_ID=${TWILIO_VERIFY_SERVICE_ID} COMMITHASH=${COMMITHASH} HELMREVISION=${HELMREVISION} PRICE_SERVER_HOST=stablesats -LND1_LOOP_MACAROON=${LND1_LOOP_MACAROON} -LND2_LOOP_MACAROON=${LND2_LOOP_MACAROON} -LND1_LOOP_TLS=${LND1_LOOP_TLS} -LND2_LOOP_TLS=${LND2_LOOP_TLS} KRATOS_MASTER_USER_PASSWORD=${KRATOS_MASTER_USER_PASSWORD} KRATOS_CALLBACK_API_KEY=${KRATOS_CALLBACK_API_KEY} KRATOS_PUBLIC_API=http://kratos:4433 diff --git a/core/api/Makefile b/core/api/Makefile index bde47dfef3..0827305da8 100644 --- a/core/api/Makefile +++ b/core/api/Makefile @@ -28,9 +28,6 @@ start-ws: . ./.env && pnpm tsnd --respawn --files -r tsconfig-paths/register -r src/services/tracing.ts \ src/servers/ws-server.ts | pnpm pino-pretty -c -l -start-loopd: - ./dev/bin/start-loopd.sh - start: start-deps make start-main & make start-trigger & make start-ws diff --git a/core/api/dev/.gitignore b/core/api/dev/.gitignore index ad467d3fd7..3440e1003c 100644 --- a/core/api/dev/.gitignore +++ b/core/api/dev/.gitignore @@ -3,7 +3,6 @@ *.db # ignore all folders with lnd data /dev/lnd/* -lnd/loopserver/* # except regtest !/dev/lnd/regtest/* diff --git a/core/api/dev/bin/save-loop-data.sh b/core/api/dev/bin/save-loop-data.sh deleted file mode 100755 index ec20cd0dc7..0000000000 --- a/core/api/dev/bin/save-loop-data.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -# script to generate the loop wallets for testing -NETWORK=regtest -mkdir ../lnd/loop/$NETWORK 2>/dev/null -mkdir ../lnd/loop/server/$NETWORK 2>/dev/null - -fetch_loop_data() { - local container_id=$(docker ps -q -f status=running -f name="galoy-$1") - if [ -n "${container_id}" ]; then - # loop.db - docker cp $container_id:/root/.loop/$NETWORK/loop.db ../lnd/loop/$NETWORK/$1.loop.db - # macaroons.db - docker cp $container_id:/root/.loop/$NETWORK/macaroons.db ../lnd/loop/$NETWORK/$1.macaroons.db - # loop.macaroon - docker cp $container_id:/root/.loop/$NETWORK/loop.macaroon ../lnd/loop/$NETWORK/$1.loop.macaroon - # base64 macaroon - base64 ../lnd/loop/$NETWORK/$1.loop.macaroon | tr -d '\n\r' > "../lnd/loop/$NETWORK/$1.loop.macaroon.base64" - # loop tls cert - docker cp $container_id:/root/.loop/$NETWORK/tls.cert ../lnd/loop/$NETWORK/$1.tls.cert - # base64 loop tls cert - base64 ../lnd/loop/$NETWORK/$1.tls.cert | tr -d '\n\r' > "../lnd/loop/$NETWORK/$1.tls.cert.base64" - # loop tls key - docker cp $container_id:/root/.loop/$NETWORK/tls.key ../lnd/loop/$NETWORK/$1.tls.key - fi -} - -fetch_loopserver_data() { - local outside=$(docker ps -q -f status=running -f name="galoy-lnd-outside-1-1") - docker cp $outside:/root/.lnd/data/chain/bitcoin/$NETWORK/admin.macaroon ../lnd/loop/server/$NETWORK - docker cp $outside:/root/.lnd/data/chain/bitcoin/$NETWORK/signer.macaroon ../lnd/loop/server/$NETWORK - docker cp $outside:/root/.lnd/data/chain/bitcoin/$NETWORK/walletkit.macaroon ../lnd/loop/server/$NETWORK - docker cp $outside:/root/.lnd/data/chain/bitcoin/$NETWORK/chainnotifier.macaroon ../lnd/loop/server/$NETWORK - docker cp $outside:/root/.lnd/data/chain/bitcoin/$NETWORK/invoices.macaroon ../lnd/loop/server/$NETWORK - docker cp $outside:/root/.lnd/data/chain/bitcoin/$NETWORK/router.macaroon ../lnd/loop/server/$NETWORK - docker cp $outside:/root/.lnd/data/chain/bitcoin/$NETWORK/admin.macaroon ../lnd/loop/server/$NETWORK/readonly.macaroon - -} - -for i in loopd1-1 loopd2-1; do - echo "Saving data for $i" - fetch_loop_data "$i" -done - -fetch_loopserver_data diff --git a/core/api/dev/bin/start-loopd.sh b/core/api/dev/bin/start-loopd.sh deleted file mode 100755 index 49f9e9badf..0000000000 --- a/core/api/dev/bin/start-loopd.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -# reload env vars -direnv reload - -# stop existing docker -docker compose stop loopserver -docker compose stop loopd1 -docker compose stop loopd2 - -# boot up the mock loopserver -docker compose up loopserver -d - -# add more sats to LNDs for loopouts, need at least 250,000 -outside=$(docker ps -q -f name="lnd-outside-1-1") -lnd1=$(docker ps -q -f name="lnd1-1") -addr1=$(docker exec $lnd1 lncli -n regtest newaddress p2wkh | grep address | awk -F'"' '{print $4}') -docker exec $outside lncli -n regtest sendcoins $addr1 500000 - -# mine some bitcoin to sync the loopserver -make mine-block - -# start the loop client with REST API -export LOOP_SERVER_INTERNAL_IP=$(docker inspect $(docker ps -q -f name="loopserver") -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}') -echo "LOOP_SERVER_INTERNAL_IP is $LOOP_SERVER_INTERNAL_IP" -docker compose up loopd1 -d -docker compose up loopd2 -d - -echo "" -echo "waiting 5 seconds..." -echo "" -sleep 5 - -# test the lnd1-loop REST API with a quote request -echo "loop1 results" -LOOP1_MACAROON_HEXSTR=$(cat dev/lnd/loop/$NETWORK/loopd1-1.loop.macaroon | xxd -p | awk '{print}' ORS='') -# echo $LOOP1_MACAROON_HEXSTR -# test loop rest api -curl -k \ - --request GET \ - --url https://localhost:8081/v1/loop/out/quote/500000 \ - --header 'Content-Type: application/json' \ - --header "Grpc-Metadata-macaroon: $LOOP1_MACAROON_HEXSTR" # --verbose - -# test the lnd2-loop REST API with a quote request -echo "loop2 results" -LOOP2_MACAROON_HEXSTR=$(cat dev/lnd/loop/$NETWORK/loopd2-1.loop.macaroon | xxd -p | awk '{print}' ORS='') -# echo $LOOP2_MACAROON_HEXSTR -# test loop2 rest api -curl -k \ - --request GET \ - --url https://localhost:8082/v1/loop/out/quote/500000 \ - --header 'Content-Type: application/json' \ - --header "Grpc-Metadata-macaroon: $LOOP2_MACAROON_HEXSTR" # --verbose diff --git a/core/api/dev/lnd/loop/regtest/loopd1-1.loop.db b/core/api/dev/lnd/loop/regtest/loopd1-1.loop.db deleted file mode 100644 index 2ecbeb7cc4..0000000000 Binary files a/core/api/dev/lnd/loop/regtest/loopd1-1.loop.db and /dev/null differ diff --git a/core/api/dev/lnd/loop/regtest/loopd1-1.loop.macaroon b/core/api/dev/lnd/loop/regtest/loopd1-1.loop.macaroon deleted file mode 100644 index 97ffff568d..0000000000 Binary files a/core/api/dev/lnd/loop/regtest/loopd1-1.loop.macaroon and /dev/null differ diff --git a/core/api/dev/lnd/loop/regtest/loopd1-1.loop.macaroon.base64 b/core/api/dev/lnd/loop/regtest/loopd1-1.loop.macaroon.base64 deleted file mode 100644 index c01e8be78a..0000000000 --- a/core/api/dev/lnd/loop/regtest/loopd1-1.loop.macaroon.base64 +++ /dev/null @@ -1 +0,0 @@ -AgEEbG9vcAJ3AwoQRGymK6/vfF3wwuVmaTj3RhIBMBoMCgRhdXRoEgRyZWFkGg8KBGxvb3ASAmluEgNvdXQaGgoLc3VnZ2VzdGlvbnMSBHJlYWQSBXdyaXRlGhUKBHN3YXASB2V4ZWN1dGUSBHJlYWQaDQoFdGVybXMSBHJlYWQAAAYgAFS/qTZItZ3ZKksQkfXAKFnsb0JS5Ok3Oi5fAgCaE/k= diff --git a/core/api/dev/lnd/loop/regtest/loopd1-1.macaroons.db b/core/api/dev/lnd/loop/regtest/loopd1-1.macaroons.db deleted file mode 100644 index 2cf7668bf5..0000000000 Binary files a/core/api/dev/lnd/loop/regtest/loopd1-1.macaroons.db and /dev/null differ diff --git a/core/api/dev/lnd/loop/regtest/loopd1-1.tls.cert b/core/api/dev/lnd/loop/regtest/loopd1-1.tls.cert deleted file mode 100644 index 63cd5cb6a1..0000000000 --- a/core/api/dev/lnd/loop/regtest/loopd1-1.tls.cert +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICJjCCAc2gAwIBAgIRAMfzeW3BtQbZi7qJ6hBNo0swCgYIKoZIzj0EAwIwOTEg -MB4GA1UEChMXbG9vcCBhdXRvZ2VuZXJhdGVkIGNlcnQxFTATBgNVBAMTDDJjZGQ1 -N2ZmZTYxZDAeFw0yMjA5MDcyMTMyMjRaFw0yMzExMDIyMTMyMjRaMDkxIDAeBgNV -BAoTF2xvb3AgYXV0b2dlbmVyYXRlZCBjZXJ0MRUwEwYDVQQDEwwyY2RkNTdmZmU2 -MWQwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATqNjqQLPcGIDZJkGzse/wvektO -QVXihRzZeKk/Y0YS41dz0vN9PvKZ3FqNcvxCykW/gWJ5hAtJBe7Ci6aZ+gGKo4G1 -MIGyMA4GA1UdDwEB/wQEAwICpDATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHRMB -Af8EBTADAQH/MB0GA1UdDgQWBBQdrlpt33iKvVTed2VuxcnnARLy9DBbBgNVHREE -VDBSggwyY2RkNTdmZmU2MWSCCWxvY2FsaG9zdIIEdW5peIIKdW5peHBhY2tldIIH -YnVmY29ubocEfwAAAYcQAAAAAAAAAAAAAAAAAAAAAYcErBsADzAKBggqhkjOPQQD -AgNHADBEAiBXhR6VdsHV+DHaXdkWeQgJs2TqOJWj0pQr5dqKpUb69AIgSxkXa6EE -VVOBgEa5tygsApc6l0RjNgTavJAzOgVOkHY= ------END CERTIFICATE----- diff --git a/core/api/dev/lnd/loop/regtest/loopd1-1.tls.cert.base64 b/core/api/dev/lnd/loop/regtest/loopd1-1.tls.cert.base64 deleted file mode 100644 index 278aea3be4..0000000000 --- a/core/api/dev/lnd/loop/regtest/loopd1-1.tls.cert.base64 +++ /dev/null @@ -1 +0,0 @@ -LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNKakNDQWMyZ0F3SUJBZ0lSQU1memVXM0J0UWJaaTdxSjZoQk5vMHN3Q2dZSUtvWkl6ajBFQXdJd09URWcKTUI0R0ExVUVDaE1YYkc5dmNDQmhkWFJ2WjJWdVpYSmhkR1ZrSUdObGNuUXhGVEFUQmdOVkJBTVREREpqWkdRMQpOMlptWlRZeFpEQWVGdzB5TWpBNU1EY3lNVE15TWpSYUZ3MHlNekV4TURJeU1UTXlNalJhTURreElEQWVCZ05WCkJBb1RGMnh2YjNBZ1lYVjBiMmRsYm1WeVlYUmxaQ0JqWlhKME1SVXdFd1lEVlFRREV3d3lZMlJrTlRkbVptVTIKTVdRd1dUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFUcU5qcVFMUGNHSURaSmtHenNlL3d2ZWt0TwpRVlhpaFJ6WmVLay9ZMFlTNDFkejB2TjlQdktaM0ZxTmN2eEN5a1cvZ1dKNWhBdEpCZTdDaTZhWitnR0tvNEcxCk1JR3lNQTRHQTFVZER3RUIvd1FFQXdJQ3BEQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBVEFQQmdOVkhSTUIKQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXQkJRZHJscHQzM2lLdlZUZWQyVnV4Y25uQVJMeTlEQmJCZ05WSFJFRQpWREJTZ2d3eVkyUmtOVGRtWm1VMk1XU0NDV3h2WTJGc2FHOXpkSUlFZFc1cGVJSUtkVzVwZUhCaFkydGxkSUlIClluVm1ZMjl1Ym9jRWZ3QUFBWWNRQUFBQUFBQUFBQUFBQUFBQUFBQUFBWWNFckJzQUR6QUtCZ2dxaGtqT1BRUUQKQWdOSEFEQkVBaUJYaFI2VmRzSFYrREhhWGRrV2VRZ0pzMlRxT0pXajBwUXI1ZHFLcFViNjlBSWdTeGtYYTZFRQpWVk9CZ0VhNXR5Z3NBcGM2bDBSak5nVGF2SkF6T2dWT2tIWT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= diff --git a/core/api/dev/lnd/loop/regtest/loopd1-1.tls.key b/core/api/dev/lnd/loop/regtest/loopd1-1.tls.key deleted file mode 100644 index 6a8f97fd84..0000000000 --- a/core/api/dev/lnd/loop/regtest/loopd1-1.tls.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN EC PRIVATE KEY----- -MHcCAQEEIGHGbr1TCDEw6eX6CJxhIy8PdKnG6wnW7UCKy7JVSB0ioAoGCCqGSM49 -AwEHoUQDQgAE6jY6kCz3BiA2SZBs7Hv8L3pLTkFV4oUc2XipP2NGEuNXc9LzfT7y -mdxajXL8QspFv4FieYQLSQXuwoummfoBig== ------END EC PRIVATE KEY----- diff --git a/core/api/dev/lnd/loop/regtest/loopd2-1.loop.db b/core/api/dev/lnd/loop/regtest/loopd2-1.loop.db deleted file mode 100644 index 340763dc29..0000000000 Binary files a/core/api/dev/lnd/loop/regtest/loopd2-1.loop.db and /dev/null differ diff --git a/core/api/dev/lnd/loop/regtest/loopd2-1.loop.macaroon b/core/api/dev/lnd/loop/regtest/loopd2-1.loop.macaroon deleted file mode 100644 index 991f160f00..0000000000 Binary files a/core/api/dev/lnd/loop/regtest/loopd2-1.loop.macaroon and /dev/null differ diff --git a/core/api/dev/lnd/loop/regtest/loopd2-1.loop.macaroon.base64 b/core/api/dev/lnd/loop/regtest/loopd2-1.loop.macaroon.base64 deleted file mode 100644 index aba6515a07..0000000000 --- a/core/api/dev/lnd/loop/regtest/loopd2-1.loop.macaroon.base64 +++ /dev/null @@ -1 +0,0 @@ -AgEEbG9vcAJ3AwoQ6Ntr7+DpuicdMgmVPKvDVxIBMBoMCgRhdXRoEgRyZWFkGg8KBGxvb3ASAmluEgNvdXQaGgoLc3VnZ2VzdGlvbnMSBHJlYWQSBXdyaXRlGhUKBHN3YXASB2V4ZWN1dGUSBHJlYWQaDQoFdGVybXMSBHJlYWQAAAYgU6bTJC50AuYehDtb9U2s4EuH7C2Tf8eAppPPOFeUXds= diff --git a/core/api/dev/lnd/loop/regtest/loopd2-1.macaroons.db b/core/api/dev/lnd/loop/regtest/loopd2-1.macaroons.db deleted file mode 100644 index c85bfe7cf1..0000000000 Binary files a/core/api/dev/lnd/loop/regtest/loopd2-1.macaroons.db and /dev/null differ diff --git a/core/api/dev/lnd/loop/regtest/loopd2-1.tls.cert b/core/api/dev/lnd/loop/regtest/loopd2-1.tls.cert deleted file mode 100644 index 0bd1dc25ba..0000000000 --- a/core/api/dev/lnd/loop/regtest/loopd2-1.tls.cert +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICJjCCAcygAwIBAgIQV7vtYTo2XKSrmkz7wtJ3cTAKBggqhkjOPQQDAjA5MSAw -HgYDVQQKExdsb29wIGF1dG9nZW5lcmF0ZWQgY2VydDEVMBMGA1UEAxMMZTFiNDhm -YmU0NjYzMB4XDTIyMDkwNzIxMzIyNVoXDTIzMTEwMjIxMzIyNVowOTEgMB4GA1UE -ChMXbG9vcCBhdXRvZ2VuZXJhdGVkIGNlcnQxFTATBgNVBAMTDGUxYjQ4ZmJlNDY2 -MzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABEXo9gtzdRqLMaav2uT08xySQJS+ -h0SLqC+vzsGDagj09x7Qonwz+jZ4xzizIlueNcBeX63wuFgGp99A1of042SjgbUw -gbIwDgYDVR0PAQH/BAQDAgKkMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8GA1UdEwEB -/wQFMAMBAf8wHQYDVR0OBBYEFFN3a7ZF9caRPbg42Wb+NbuX3hSaMFsGA1UdEQRU -MFKCDGUxYjQ4ZmJlNDY2M4IJbG9jYWxob3N0ggR1bml4ggp1bml4cGFja2V0ggdi -dWZjb25uhwR/AAABhxAAAAAAAAAAAAAAAAAAAAABhwSsGwAQMAoGCCqGSM49BAMC -A0gAMEUCIQDTqJgV+QzK67yR7YFqkrBCzhD68LYr0A3RLXQurC6wmAIgY4gDJ05y -QN2Bcf/hIzTrpoVe+v4nPQDH7mpEAtr8Oz0= ------END CERTIFICATE----- diff --git a/core/api/dev/lnd/loop/regtest/loopd2-1.tls.cert.base64 b/core/api/dev/lnd/loop/regtest/loopd2-1.tls.cert.base64 deleted file mode 100644 index d39ccbb0f5..0000000000 --- a/core/api/dev/lnd/loop/regtest/loopd2-1.tls.cert.base64 +++ /dev/null @@ -1 +0,0 @@ -LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNKakNDQWN5Z0F3SUJBZ0lRVjd2dFlUbzJYS1NybWt6N3d0SjNjVEFLQmdncWhrak9QUVFEQWpBNU1TQXcKSGdZRFZRUUtFeGRzYjI5d0lHRjFkRzluWlc1bGNtRjBaV1FnWTJWeWRERVZNQk1HQTFVRUF4TU1aVEZpTkRobQpZbVUwTmpZek1CNFhEVEl5TURrd056SXhNekl5TlZvWERUSXpNVEV3TWpJeE16SXlOVm93T1RFZ01CNEdBMVVFCkNoTVhiRzl2Y0NCaGRYUnZaMlZ1WlhKaGRHVmtJR05sY25ReEZUQVRCZ05WQkFNVERHVXhZalE0Wm1KbE5EWTIKTXpCWk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQkVYbzlndHpkUnFMTWFhdjJ1VDA4eHlTUUpTKwpoMFNMcUMrdnpzR0RhZ2owOXg3UW9ud3oralo0eHppeklsdWVOY0JlWDYzd3VGZ0dwOTlBMW9mMDQyU2pnYlV3CmdiSXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01CTUdBMVVkSlFRTU1Bb0dDQ3NHQVFVRkJ3TUJNQThHQTFVZEV3RUIKL3dRRk1BTUJBZjh3SFFZRFZSME9CQllFRkZOM2E3WkY5Y2FSUGJnNDJXYitOYnVYM2hTYU1Gc0dBMVVkRVFSVQpNRktDREdVeFlqUTRabUpsTkRZMk00SUpiRzlqWVd4b2IzTjBnZ1IxYm1sNGdncDFibWw0Y0dGamEyVjBnZ2RpCmRXWmpiMjV1aHdSL0FBQUJoeEFBQUFBQUFBQUFBQUFBQUFBQUFBQUJod1NzR3dBUU1Bb0dDQ3FHU000OUJBTUMKQTBnQU1FVUNJUURUcUpnVitReks2N3lSN1lGcWtyQkN6aEQ2OExZcjBBM1JMWFF1ckM2d21BSWdZNGdESjA1eQpRTjJCY2YvaEl6VHJwb1ZlK3Y0blBRREg3bXBFQXRyOE96MD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= diff --git a/core/api/dev/lnd/loop/regtest/loopd2-1.tls.key b/core/api/dev/lnd/loop/regtest/loopd2-1.tls.key deleted file mode 100644 index ffa9c7c8ae..0000000000 --- a/core/api/dev/lnd/loop/regtest/loopd2-1.tls.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN EC PRIVATE KEY----- -MHcCAQEEIChwzC4bQi68zZMIGUgUVb5NAtCX6evswxz99EXBqGq2oAoGCCqGSM49 -AwEHoUQDQgAERej2C3N1Gosxpq/a5PTzHJJAlL6HRIuoL6/OwYNqCPT3HtCifDP6 -NnjHOLMiW541wF5frfC4WAan30DWh/TjZA== ------END EC PRIVATE KEY----- diff --git a/core/api/dev/lnd/loop/server/regtest/admin.macaroon b/core/api/dev/lnd/loop/server/regtest/admin.macaroon deleted file mode 100644 index 246395ba4b..0000000000 Binary files a/core/api/dev/lnd/loop/server/regtest/admin.macaroon and /dev/null differ diff --git a/core/api/dev/lnd/loop/server/regtest/chainnotifier.macaroon b/core/api/dev/lnd/loop/server/regtest/chainnotifier.macaroon deleted file mode 100644 index bf8001c7c5..0000000000 Binary files a/core/api/dev/lnd/loop/server/regtest/chainnotifier.macaroon and /dev/null differ diff --git a/core/api/dev/lnd/loop/server/regtest/invoices.macaroon b/core/api/dev/lnd/loop/server/regtest/invoices.macaroon deleted file mode 100644 index a28f362f44..0000000000 Binary files a/core/api/dev/lnd/loop/server/regtest/invoices.macaroon and /dev/null differ diff --git a/core/api/dev/lnd/loop/server/regtest/readonly.macaroon b/core/api/dev/lnd/loop/server/regtest/readonly.macaroon deleted file mode 100644 index 246395ba4b..0000000000 Binary files a/core/api/dev/lnd/loop/server/regtest/readonly.macaroon and /dev/null differ diff --git a/core/api/dev/lnd/loop/server/regtest/router.macaroon b/core/api/dev/lnd/loop/server/regtest/router.macaroon deleted file mode 100644 index 7b5f51c1a7..0000000000 Binary files a/core/api/dev/lnd/loop/server/regtest/router.macaroon and /dev/null differ diff --git a/core/api/dev/lnd/loop/server/regtest/signer.macaroon b/core/api/dev/lnd/loop/server/regtest/signer.macaroon deleted file mode 100644 index bb5d018e2c..0000000000 Binary files a/core/api/dev/lnd/loop/server/regtest/signer.macaroon and /dev/null differ diff --git a/core/api/dev/lnd/loop/server/regtest/walletkit.macaroon b/core/api/dev/lnd/loop/server/regtest/walletkit.macaroon deleted file mode 100644 index 02c2e06b1f..0000000000 Binary files a/core/api/dev/lnd/loop/server/regtest/walletkit.macaroon and /dev/null differ diff --git a/core/api/docker-compose.yml b/core/api/docker-compose.yml index d5f50743ca..9f4a91373d 100644 --- a/core/api/docker-compose.yml +++ b/core/api/docker-compose.yml @@ -220,92 +220,6 @@ services: cp /root/.lnd/admin.macaroon /root/.lnd/data/chain/bitcoin/regtest/admin.macaroon /bin/lnd depends_on: [bitcoind] - loopserver: - image: lightninglabs/loopserver:v0.9.52-beta - ports: - - "11009:11009" - restart: unless-stopped - volumes: - - ${HOST_PROJECT_PATH:-.}/dev/lnd/lnd.conf:/root/.lnd/lnd.conf - - ${HOST_PROJECT_PATH:-.}/dev/lnd/tls.key:/root/.lnd/tls.key - - ${HOST_PROJECT_PATH:-.}/dev/lnd/tls.cert:/root/.lnd/tls.cert - - ${HOST_PROJECT_PATH:-.}/dev/lnd/loop/server/regtest:/root/.lnd/data/chain/bitcoin/regtest - depends_on: - - lnd-outside-1 - command: - - "daemon" - - "--maxamt=5000000" - - "--lnd.host=lnd-outside-1:10009" - - "--lnd.macaroondir=/root/.lnd/data/chain/bitcoin/regtest" - - "--lnd.tlspath=/root/.lnd/tls.cert" - loopd1: - image: lightninglabs/loop:v0.20.1-beta - ports: - - "8081:8081" - - "11010:11010" - restart: unless-stopped - volumes: - - ${HOST_PROJECT_PATH:-.}/dev/lnd/lnd.conf:/root/.lnd/lnd.conf - - ${HOST_PROJECT_PATH:-.}/dev/lnd/tls.key:/root/.lnd/tls.key - - ${HOST_PROJECT_PATH:-.}/dev/lnd/tls.cert:/root/.lnd/tls.cert - - ${HOST_PROJECT_PATH:-.}/dev/lnd/regtest/lnd1.admin.macaroon:/root/.lnd/lnd1.admin.macaroon - - ${HOST_PROJECT_PATH:-.}/dev/lnd/loop/regtest/loopd1-1.macaroons.db:/root/.loop/tmp/macaroons.db - - ${HOST_PROJECT_PATH:-.}/dev/lnd/loop/regtest/loopd1-1.loop.db:/root/.loop/tmp/loop.db - - ${HOST_PROJECT_PATH:-.}/dev/lnd/loop/regtest/loopd1-1.tls.key:/root/.loop/tmp/tls.key - - ${HOST_PROJECT_PATH:-.}/dev/lnd/loop/regtest/loopd1-1.tls.cert:/root/.loop/tmp/tls.cert - - ${HOST_PROJECT_PATH:-.}/dev/lnd/loop/regtest/loopd1-1.loop.macaroon:/root/.loop/tmp/loop.macaroon - depends_on: - - lnd1 - - loopserver - environment: - - LOOP_SERVER_INTERNAL_IP=${LOOP_SERVER_INTERNAL_IP} - command: bash -c " - mkdir -p /root/.loop/regtest/ && - cp /root/.loop/tmp/* /root/.loop/regtest/ && - loopd\ - --network=regtest\ - --debuglevel=debug\ - --server.host=${LOOP_SERVER_INTERNAL_IP}:11009\ - --server.notls --lnd.host=lnd1:10009\ - --lnd.macaroonpath=/root/.lnd/lnd1.admin.macaroon\ - --lnd.tlspath=/root/.lnd/tls.cert\ - --tlsautorefresh\ - --restlisten=0.0.0.0:8081\ - --rpclisten=0.0.0.0:11010" - loopd2: - image: lightninglabs/loop:v0.20.1-beta - ports: - - "8082:8081" - - "11011:11010" - restart: unless-stopped - volumes: - - ${HOST_PROJECT_PATH:-.}/dev/lnd/lnd.conf:/root/.lnd/lnd.conf - - ${HOST_PROJECT_PATH:-.}/dev/lnd/tls.key:/root/.lnd/tls.key - - ${HOST_PROJECT_PATH:-.}/dev/lnd/tls.cert:/root/.lnd/tls.cert - - ${HOST_PROJECT_PATH:-.}/dev/lnd/regtest/lnd2.admin.macaroon:/root/.lnd/lnd2.admin.macaroon - - ${HOST_PROJECT_PATH:-.}/dev/lnd/loop/regtest/loopd2-1.macaroons.db:/root/.loop/tmp/macaroons.db - - ${HOST_PROJECT_PATH:-.}/dev/lnd/loop/regtest/loopd2-1.loop.db:/root/.loop/tmp/loop.db - - ${HOST_PROJECT_PATH:-.}/dev/lnd/loop/regtest/loopd2-1.tls.key:/root/.loop/tmp/tls.key - - ${HOST_PROJECT_PATH:-.}/dev/lnd/loop/regtest/loopd2-1.tls.cert:/root/.loop/tmp/tls.cert - - ${HOST_PROJECT_PATH:-.}/dev/lnd/loop/regtest/loopd2-1.loop.macaroon:/root/.loop/tmp/loop.macaroon - depends_on: - - lnd2 - - loopserver - environment: - - LOOP_SERVER_INTERNAL_IP=${LOOP_SERVER_INTERNAL_IP} - command: bash -c " - mkdir -p /root/.loop/regtest/ && - cp /root/.loop/tmp/* /root/.loop/regtest/ && - loopd\ - --network=regtest\ - --debuglevel=debug\ - --server.host=${LOOP_SERVER_INTERNAL_IP}:11009\ - --server.notls --lnd.host=lnd2:10009\ - --lnd.macaroonpath=/root/.lnd/lnd2.admin.macaroon\ - --lnd.tlspath=/root/.lnd/tls.cert\ - --tlsautorefresh\ - --restlisten=0.0.0.0:8081\ - --rpclisten=0.0.0.0:11010" stablesats: image: us.gcr.io/galoy-org/stablesats-rs:latest ports: diff --git a/core/api/src/config/env.ts b/core/api/src/config/env.ts index fcb7a814a4..3e9d2d8251 100644 --- a/core/api/src/config/env.ts +++ b/core/api/src/config/env.ts @@ -108,11 +108,6 @@ export const env = createEnv({ .transform((x) => x.split(",")), LND2_NAME: z.string().min(1).default("lnd2"), - LND1_LOOP_TLS: z.string().min(1).optional(), - LND1_LOOP_MACAROON: z.string().min(1).optional(), - LND2_LOOP_TLS: z.string().min(1).optional(), - LND2_LOOP_MACAROON: z.string().min(1).optional(), - PRICE_HOST: z.string().min(1).default("galoy-price"), PRICE_PORT: z.number().min(1).or(z.string()).pipe(z.coerce.number()).default(50051), @@ -214,11 +209,6 @@ export const env = createEnv({ LND2_TYPE: process.env.LND2_TYPE, LND2_NAME: process.env.LND2_NAME, - LND1_LOOP_TLS: process.env.LND1_LOOP_TLS, - LND1_LOOP_MACAROON: process.env.LND1_LOOP_MACAROON, - LND2_LOOP_TLS: process.env.LND2_LOOP_TLS, - LND2_LOOP_MACAROON: process.env.LND2_LOOP_MACAROON, - PRICE_HOST: process.env.PRICE_HOST, PRICE_PORT: process.env.PRICE_PORT, diff --git a/core/api/src/config/index.ts b/core/api/src/config/index.ts index cd71ddf4fa..5b6148e897 100644 --- a/core/api/src/config/index.ts +++ b/core/api/src/config/index.ts @@ -134,10 +134,6 @@ export const LND2_DNS = env.LND2_DNS export const LND2_RPCPORT = env.LND2_RPCPORT export const LND2_TYPE = env.LND2_TYPE as LndNodeType[] export const LND2_NAME = env.LND2_NAME -export const LND1_LOOP_TLS = env.LND1_LOOP_TLS -export const LND1_LOOP_MACAROON = env.LND1_LOOP_MACAROON as Macaroon -export const LND2_LOOP_TLS = env.LND2_LOOP_TLS -export const LND2_LOOP_MACAROON = env.LND2_LOOP_MACAROON as Macaroon export const PRICE_HOST = env.PRICE_HOST export const PRICE_PORT = env.PRICE_PORT export const PRICE_HISTORY_HOST = env.PRICE_HISTORY_HOST diff --git a/core/api/src/services/ledger/README.md b/core/api/src/services/ledger/README.md index 2b5c6a90af..eb090b4046 100644 --- a/core/api/src/services/ledger/README.md +++ b/core/api/src/services/ledger/README.md @@ -41,7 +41,6 @@ The "bankowner" user is the account from which revenue and expenses are being ch Some expenses are not been recorded yet to this account, including: - rebalancing from cold storage to the hot wallet -- usage of loop or pool ## Real time dashboard