From 6577fc7d66f09221436f0216aa016a745a8e9edb Mon Sep 17 00:00:00 2001 From: vindard <17693119+vindard@users.noreply.github.com> Date: Tue, 30 Jan 2024 17:18:31 -0400 Subject: [PATCH] chore(core): remove loopd configs and dependencies --- .env | 10 -- .env.ci | 4 - core/api/.env | 10 -- core/api/.env.ci | 4 - core/api/Makefile | 3 - core/api/dev/.gitignore | 1 - core/api/dev/bin/save-loop-data.sh | 45 --------- core/api/dev/bin/start-loopd.sh | 54 ----------- .../api/dev/lnd/loop/regtest/loopd1-1.loop.db | Bin 131072 -> 0 bytes .../lnd/loop/regtest/loopd1-1.loop.macaroon | Bin 164 -> 0 bytes .../regtest/loopd1-1.loop.macaroon.base64 | 1 - .../lnd/loop/regtest/loopd1-1.macaroons.db | Bin 32768 -> 0 bytes .../dev/lnd/loop/regtest/loopd1-1.tls.cert | 14 --- .../lnd/loop/regtest/loopd1-1.tls.cert.base64 | 1 - .../api/dev/lnd/loop/regtest/loopd1-1.tls.key | 5 - .../api/dev/lnd/loop/regtest/loopd2-1.loop.db | Bin 32768 -> 0 bytes .../lnd/loop/regtest/loopd2-1.loop.macaroon | Bin 164 -> 0 bytes .../regtest/loopd2-1.loop.macaroon.base64 | 1 - .../lnd/loop/regtest/loopd2-1.macaroons.db | Bin 32768 -> 0 bytes .../dev/lnd/loop/regtest/loopd2-1.tls.cert | 14 --- .../lnd/loop/regtest/loopd2-1.tls.cert.base64 | 1 - .../api/dev/lnd/loop/regtest/loopd2-1.tls.key | 5 - .../lnd/loop/server/regtest/admin.macaroon | Bin 293 -> 0 bytes .../server/regtest/chainnotifier.macaroon | Bin 83 -> 0 bytes .../lnd/loop/server/regtest/invoices.macaroon | Bin 91 -> 0 bytes .../lnd/loop/server/regtest/readonly.macaroon | Bin 293 -> 0 bytes .../lnd/loop/server/regtest/router.macaroon | Bin 91 -> 0 bytes .../lnd/loop/server/regtest/signer.macaroon | Bin 92 -> 0 bytes .../loop/server/regtest/walletkit.macaroon | Bin 114 -> 0 bytes core/api/docker-compose.yml | 86 ------------------ core/api/src/config/env.ts | 10 -- core/api/src/config/index.ts | 4 - core/api/src/services/ledger/README.md | 1 - 33 files changed, 274 deletions(-) delete mode 100755 core/api/dev/bin/save-loop-data.sh delete mode 100755 core/api/dev/bin/start-loopd.sh delete mode 100644 core/api/dev/lnd/loop/regtest/loopd1-1.loop.db delete mode 100644 core/api/dev/lnd/loop/regtest/loopd1-1.loop.macaroon delete mode 100644 core/api/dev/lnd/loop/regtest/loopd1-1.loop.macaroon.base64 delete mode 100644 core/api/dev/lnd/loop/regtest/loopd1-1.macaroons.db delete mode 100644 core/api/dev/lnd/loop/regtest/loopd1-1.tls.cert delete mode 100644 core/api/dev/lnd/loop/regtest/loopd1-1.tls.cert.base64 delete mode 100644 core/api/dev/lnd/loop/regtest/loopd1-1.tls.key delete mode 100644 core/api/dev/lnd/loop/regtest/loopd2-1.loop.db delete mode 100644 core/api/dev/lnd/loop/regtest/loopd2-1.loop.macaroon delete mode 100644 core/api/dev/lnd/loop/regtest/loopd2-1.loop.macaroon.base64 delete mode 100644 core/api/dev/lnd/loop/regtest/loopd2-1.macaroons.db delete mode 100644 core/api/dev/lnd/loop/regtest/loopd2-1.tls.cert delete mode 100644 core/api/dev/lnd/loop/regtest/loopd2-1.tls.cert.base64 delete mode 100644 core/api/dev/lnd/loop/regtest/loopd2-1.tls.key delete mode 100644 core/api/dev/lnd/loop/server/regtest/admin.macaroon delete mode 100644 core/api/dev/lnd/loop/server/regtest/chainnotifier.macaroon delete mode 100644 core/api/dev/lnd/loop/server/regtest/invoices.macaroon delete mode 100644 core/api/dev/lnd/loop/server/regtest/readonly.macaroon delete mode 100644 core/api/dev/lnd/loop/server/regtest/router.macaroon delete mode 100644 core/api/dev/lnd/loop/server/regtest/signer.macaroon delete mode 100644 core/api/dev/lnd/loop/server/regtest/walletkit.macaroon 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 2ecbeb7cc4f268f9498a8faa7d5ad49c812c6a07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131072 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 U1Rwwb2tWV=5P$##ATTxc5BOxnA^-pY 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 97ffff568d6f5bfef8e31efce81bf38415c5e8b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmZQ#WXZ|TFJLNX<`QtpS*E@IeNF6#Lr>E(Exx-6F&aqmaIqwomShOA6s0DnNbz%l zRSPj?<_R(9mzGFLad8)yrl+SCmt^MW6+=`Bv6dHQmZVCFadIXGHyX@9J z`b5QFHU!8rYiV&|Eid*-jiW>W0R#|0009ILKmY**5I_Kdza!uyr}EqQ-%pNL@xMvd zEk*g3a%z^+5I_I{1Q0*~0R#|000AYS_Va_~&c3hgP;tH*M~MIe2q1s} z0tg_000IagfB*vCE1=?i75}UM1Bm~<_n9(t1Q0*~0R#|0009ILKmY**z6+@L{tcSv zB!GU^kN#Ukz81N$vZ}SYxxJyLvrW`~Ooq>o0%%&47@_|}t{hn^O8uxniOBJ3EeBf} z=GfI^M?pk?PFLTEc_QfWrncJdxXrja4!fJb9Gsk;Imw`Q(f&g`)5pFKyPPfXX1A6W-td=s`d z60K9~hTVEseTu8|$!ZTNbiSF_#*AiXlw@1V<^P{&1L>Z~|KmL1b^GY~X=m&H|Ln|42oNAZfB*pk z1PBlyK!5;&5Quz!vzWCapI?dzY61iZ5FkK+009C72oNAZpz{Ke???V0=K=En&VRKw zK!5-N0t5&UAV7cs0RjZR1meB_`C`_}zXv!-v6iBjBKMC|tfc6r$o)FSYKq;a|B&j9 z6ulI~>UvTQs_`_nTT2`;46m;0el=>HlLlkj<=MC#l;iUEd3i;%lK-+GpJ(Kq3{LVY z7bm0Bi}L3Dtbcn~*0*V-wZw{UJ;M 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 991f160f00f163f361ccc96bd63bd4d04a1dad9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmZQ#WXZ|TFJLNX<`Q^uJNx~Em%G$ujX0;;tUeqr#AqPJ!^M(VT9P5eQk0sQBE`=I zRxQMonJ2`YUs@t1#l>A*nx39oT#}ieR}4`l#9CgIS&}Lx%EeM#o>(Bno?4NbTw0O} zHG`LnwIsDD7pjEZj{YIQj%72S|R4y8AT3`Y~QJQGw+b=?|3UML83+OhAbhlzo;=D3LQJMTe~XSn#hB4>6bdC`2FkyQG);P%X{mwK01 z!*);REwxW`uMTIM?2jqCzo2E$Hr03W9GjOG^OBc%n_}9xyFAtL8efhcfH?ODgXcg 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 246395ba4bbfb49b11049c46e44d975ba28d35f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 293 zcmZQ#WX{P;Vfw+y%q39azq4Ax`2Am&BbvYE7jRAyVl9T=3>drOUp+U6zAf|%qz>!Oio2pt;ofZo0yzfl%Jm`#F3twms*rql8UMq zXi+ZEmc(>4aiE#`X=%wBiJ5sA8uIh7h>LKs7Nn*Yp}9bUi>){_9cVGS{R|9j3i`W3 jeje)EzUJ7;l)I6c4JwX)nMJih%Sm-M07t3AcCzAjaeBlHphFd7dE2XAg;Xklq?5(IK( pVPpUR1|aN0hz_f$H+=yL6?q+xq=7ZBQ|Ik0#w~i3YQnqKdq9N>9-9CF 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 a28f362f446e361d9124ce0db79191d78383a199..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 91 zcmV-h0Hpr{0RwDqWCAY(3J@2Wm-M07t3AcCzAjaeBlHphFd7#M2x)G1Z)sy?a}oq{ xWnp9z1$T03bY%bl1|ZstVK=-j-Rl_whQtP5F6ADfdXk1335;LNpRs*T6Of6oAprmY 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 246395ba4bbfb49b11049c46e44d975ba28d35f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 293 zcmZQ#WX{P;Vfw+y%q39azq4Ax`2Am&BbvYE7jRAyVl9T=3>drOUp+U6zAf|%qz>!Oio2pt;ofZo0yzfl%Jm`#F3twms*rql8UMq zXi+ZEmc(>4aiE#`X=%wBiJ5sA8uIh7h>LKs7Nn*Yp}9bUi>){_9cVGS{R|9j3i`W3 jeje)EzUJ7;l)I6c4JwX)nMJih%=dR}Ug5J!3{kV-5` w6=Eq$O-x~6U{fe~H1mmcuAeMp_36gN-HXo~-R4k%fXu;0jV@0+yDRo 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 02c2e06b1fcc86637d703322ea4ac16481c48c86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmZQ#WX{P;VRB>U5)hp^{ma4|t8I^N+NT#fLHUaiqk)td7kgq#N>OTYu@Fm9YGR5I zYk5&-Nh(M@KQB2WF*6TEoPmK&p?GfntGQLb&F`kAKXMS*+if-N#wuas8d 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