GaloyMoney · vindard · Jan 31, 2024 · Jan 30, 2024
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/core/api/dev/bin/start-loopd.sh b/core/api/dev/bin/start-loopd.sh
diff --git a/core/api/dev/lnd/loop/regtest/loopd1-1.loop.db b/core/api/dev/lnd/loop/regtest/loopd1-1.loop.db
diff --git a/core/api/dev/lnd/loop/regtest/loopd1-1.loop.macaroon b/core/api/dev/lnd/loop/regtest/loopd1-1.loop.macaroon
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
diff --git a/core/api/dev/lnd/loop/regtest/loopd1-1.macaroons.db b/core/api/dev/lnd/loop/regtest/loopd1-1.macaroons.db
diff --git a/core/api/dev/lnd/loop/regtest/loopd1-1.tls.cert b/core/api/dev/lnd/loop/regtest/loopd1-1.tls.cert
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
diff --git a/core/api/dev/lnd/loop/regtest/loopd1-1.tls.key b/core/api/dev/lnd/loop/regtest/loopd1-1.tls.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
diff --git a/core/api/dev/lnd/loop/regtest/loopd2-1.loop.macaroon b/core/api/dev/lnd/loop/regtest/loopd2-1.loop.macaroon
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
diff --git a/core/api/dev/lnd/loop/regtest/loopd2-1.macaroons.db b/core/api/dev/lnd/loop/regtest/loopd2-1.macaroons.db
diff --git a/core/api/dev/lnd/loop/regtest/loopd2-1.tls.cert b/core/api/dev/lnd/loop/regtest/loopd2-1.tls.cert
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
diff --git a/core/api/dev/lnd/loop/regtest/loopd2-1.tls.key b/core/api/dev/lnd/loop/regtest/loopd2-1.tls.key
diff --git a/core/api/dev/lnd/loop/server/regtest/admin.macaroon b/core/api/dev/lnd/loop/server/regtest/admin.macaroon
diff --git a/core/api/dev/lnd/loop/server/regtest/chainnotifier.macaroon b/core/api/dev/lnd/loop/server/regtest/chainnotifier.macaroon
diff --git a/core/api/dev/lnd/loop/server/regtest/invoices.macaroon b/core/api/dev/lnd/loop/server/regtest/invoices.macaroon
diff --git a/core/api/dev/lnd/loop/server/regtest/readonly.macaroon b/core/api/dev/lnd/loop/server/regtest/readonly.macaroon
diff --git a/core/api/dev/lnd/loop/server/regtest/router.macaroon b/core/api/dev/lnd/loop/server/regtest/router.macaroon
diff --git a/core/api/dev/lnd/loop/server/regtest/signer.macaroon b/core/api/dev/lnd/loop/server/regtest/signer.macaroon
diff --git a/core/api/dev/lnd/loop/server/regtest/walletkit.macaroon b/core/api/dev/lnd/loop/server/regtest/walletkit.macaroon