From d1e880aac7edfdfb1fef2e7c8bd8732e4b769611 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 29 May 2024 19:42:10 +0100 Subject: [PATCH 1/9] local environment --- alts/navfiber.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/alts/navfiber.yml b/alts/navfiber.yml index c24f5c5..41c0a87 100644 --- a/alts/navfiber.yml +++ b/alts/navfiber.yml @@ -421,9 +421,9 @@ services: - STAKWORK_ADD_NODE_URL=https://staging.stakwork.com/api/v1/projects - STAKWORK_ADD_NODE_TOKEN=${STAKWORK_TOKEN} - JARVIS_BACKEND_PORT=5000 - - AWS_ACCESS_KEY_ID=**** - - AWS_SECRET_ACCESS_KEY=**** - - AWS_S3_BUCKET_PATH=https://test.com + - AWS_ACCESS_KEY_ID=***** + - AWS_SECRET_ACCESS_KEY=****** + - AWS_S3_BUCKET_PATH=https://stakwork-uploads.s3.amazonaws.com/knowledge-graph-joe/content-images - AWS_S3_REGION_NAME=us-east-1 - RADAR_RSS_SCHEDULER_TIME_IN_SEC=5090000 - RADAR_TWITTER_SCHEDULER_TIME_IN_SEC=tue,21,14 @@ -460,8 +460,10 @@ services: - TUTORIAL_GENERATOR_WORKFLOW_ID=2562 - INSTAGRAPH_GENERATOR_WORKFLOW_ID=2563 - QUESTION_AND_ANSWER_WORKFLOW_ID=2564 - - TLDR_WORKFLOW_ID=2565 + - TLDR_WORKFLOW_ID=8262 - TWITTER_BEARER=${TWITTER_BEARER} + - TLDR_REQUEST_URL=https://staging.stakwork.com/api/v1/projects + - FEATURE_FLAG_SCHEMA=true ports: - 5000:5000 links: From 1eabc390c5c96891aa8c4a36bdd53c152c7fbe02 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 29 May 2024 21:03:53 +0100 Subject: [PATCH 2/9] feat: lnd setup --- alts/smaller-navfiber.yml | 356 +++++++++++++++++++++++++++++++ lnd/setup/index.js | 21 +- lnd/setup/nodes/navfiberNodes.js | 53 +++++ 3 files changed, 425 insertions(+), 5 deletions(-) create mode 100644 alts/smaller-navfiber.yml create mode 100644 lnd/setup/nodes/navfiberNodes.js diff --git a/alts/smaller-navfiber.yml b/alts/smaller-navfiber.yml new file mode 100644 index 0000000..99d06e1 --- /dev/null +++ b/alts/smaller-navfiber.yml @@ -0,0 +1,356 @@ +version: "3" + +services: + bitcoind: + image: lncm/bitcoind:v25.0 + restart: on-failure + container_name: bitcoind.sphinx + volumes: + - ./bitcoind:/data/.bitcoin + ports: + - 18443:18443 + - 8333:8333 + - 28332:28332 + - 28333:28333 + + bob-lnd: + image: lightninglabs/lnd:v0.16.2-beta + container_name: bob-lnd.sphinx + volumes: + - ./lnd/bob/.lnd:/root/.lnd + - ./lnd/setup:/lndsetup + ports: + - 9736:9735 + - 10010:10010 + - 38882:38882 + command: --configfile=/lndsetup/bob.conf + + lndsetup: + image: node:12-buster-slim + depends_on: + - bob-lnd + - dave-cln + restart: "no" + entrypoint: ["node", "/lndsetup/index.js"] + volumes: + - ./lnd/bob/.lnd:/bob/.lnd + - ./lnd/setup:/lndsetup + - ./lnd/setup/nodes/navfiberNodes.js:/lndsetup/nodes.js + environment: + - NAV_FIBER=true + + auth: + image: sphinxlightning/sphinx-auth:0.2.3 + container_name: auth.sphinx + restart: on-failure + depends_on: + - db + environment: + - JWT_KEY=19e0bb49bhyuibme + - HOST=localhost:9090 + ports: + - 9090:9090 + + mqtt: + image: sphinxlightning/sphinx-mqtt:test-2 + container_name: mqtt.sphinx + restart: on-failure + depends_on: + - auth + ports: + - 1883:1883 + db: + image: postgres + container_name: db.sphinx + restart: on-failure + environment: + - POSTGRES_PASSWORD=sphinx + - POSTGRES_USER=postgres + volumes: + - ./init.sql:/docker-entrypoint-initdb.d/init.sql + - ./pgdata:/var/lib/postgresql/data + ports: + - 5433:5432 + + meme: + image: sphinxlightning/sphinx-meme:0.2.2 + container_name: meme.sphinx + restart: on-failure + depends_on: + - db + volumes: + - ./memes:/app/files + environment: + - PORT=5555 + - JWT_KEY=19e0bb49bhyuibme + - STORAGE_MODE=local + - LOCAL_DIR=app/files + - LOCAL_ENCRYPTION_KEY=88303a55f5829d9e35936364204bcb007fe330db649902fa1085a7bce3732347 + - HOST=meme.sphinx:5555 + - DATABASE_URL=postgres://postgres:sphinx@db.sphinx:5432/postgres?sslmode=disable + ports: + - 5555:5555 + + bob: + image: sphinxlightning/sphinx-relay + container_name: bob.sphinx + user: root + restart: on-failure + depends_on: + - bob-lnd + entrypoint: + [ + "node", + "/relay/dist/app.js", + "--config=/relay/configs/bob.json", + "--db=/relay/configs/bob-db.json", + ] + volumes: + - ./relay:/relay/configs + - ./lnd/bob/.lnd:/relay/bob/.lnd + environment: + - NODE_ENV=${GITACTION_ENV:-development} + - PORT=3002 + - TRIBES_HOST=host.docker.internal:13000 + ports: + - 3002:3002 + extra_hosts: + - "host.docker.internal:host-gateway" + + dave: + image: sphinxlightning/sphinx-relay + container_name: dave.sphinx + user: root + restart: on-failure + depends_on: + - dave-cln + - proxy + entrypoint: + [ + "node", + "/relay/dist/app.js", + "--config=/relay/configs/cln-dave.json", + "--db=/relay/configs/dave-db.json", + ] + volumes: + - ./relay:/relay/configs + - ./cln/dave-cln/regtest:/relay/dave/regtest + - ./proxy:/proxy + environment: + - NODE_ENV=${GITACTION_ENV:-development} + - PORT=3004 + - TRIBES_HOST=host.docker.internal:13000 + ports: + - 3004:3004 + + relaysetup: + image: node:12-buster-slim + depends_on: + - bob + - dave + - lndsetup + restart: on-failure + entrypoint: ["node", "/relay/setup/index.js"] + volumes: + - ./relay:/relay + - ./relay/nodes_partial/cln_proxy_nodes_partial.json:/relay/nodes_partial.json + environment: + - DAVE_IP=http://host.docker.internal:3004 + + proxy: + image: sphinxlightning/sphinx-proxy:latest + container_name: proxy.sphinx + restart: always + user: root + depends_on: + - dave-cln + volumes: + - ./lnd/dave/.lnd:/lnd/.lnd + - ./proxy/cert:/cert + - ./proxy/macaroons:/macaroons + - ./proxy/badger:/badger + - ./cln/dave-cln/regtest:/cln/creds + - type: bind + source: ./proxy/lnd_proxy.conf + target: /lnd_proxy.conf + entrypoint: + [ + "/app/sphinx-proxy", + "--rpclisten=0.0.0.0:11111", + "--tlscertpath=/cert/tls.cert", + "--tlskeypath=/cert/tls.key", + "--bitcoin.regtest", + "--bitcoin.active", + "--bitcoin.basefee=0", + "--store-key=4967BC847DDEFF47C4BC890038F5A495", + "--unlock-pwd=hi123456", + "--server-macaroons-dir=/macaroons", + "--channels-start=2", + "--admin-token=r46bnf8ibrhbb424heba", + "--admin-port=5050", + "--admin-pubkey=037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3", + "--initial-msat=500000", + "--mqtt-broker=tcps://mqtt.sphinx:1883", + "--topic-uuid=YLkmJR_jaWBRICt21_IG01sopeqvE_8JUv3NXbBV9egjj2Y9AFf8iTmugbxtlxcnNc-RjYpbdN9E_vMWm4LHXTCbhL4O", + "--tlsextradomain=proxy.sphinx", + "--use-hd-keys", + "--mode=cln", + "--cln-ca-cert=/cln/creds/ca.pem", + "--cln-client-cert=/cln/creds/client.pem", + "--cln-client-key=/cln/creds/client-key.pem", + "--cln-ip=dave-cln.sphinx", + "--cln-port=10012", + "--cln-server-name=cln", + "--htlc-interceptor-ip=dave-cln.sphinx", + "--htlc-interceptor-port=10212", + ] + ports: + - 11111:11111 + - 5050:5050 + + boltwall: + image: sphinxlightning/sphinx-boltwall:latest + container_name: boltwall.sphinx + restart: on-failure + depends_on: + - boltwallsetup + volumes: + - ./boltwall/.env:/usr/src/app/.env + ports: + - 8444:8444 + + boltwallsetup: + image: node:12-buster-slim + restart: on-failure + entrypoint: ["node", "/boltwall/setup/index.js"] + volumes: + - ./boltwall:/boltwall + - ./boltwall/.env:/boltwall/.env + - ./lnd:/lnd + + dave-cln: + image: sphinxlightning/cln-sphinx:latest + container_name: dave-cln.sphinx + command: + - --addr=0.0.0.0:19846 + - --bitcoin-rpcconnect=bitcoind.sphinx + - --bitcoin-rpcport=18443 + - --bitcoin-rpcuser=evan + - --bitcoin-rpcpassword=thepass + - --network=regtest + - --log-level=debug + - --alias=dave-cln + - --grpc-port=10012 + - --accept-htlc-tlv-type=133773310 + - --plugin=/usr/local/libexec/c-lightning/plugins/gateway-cln-extension + environment: + - EXPOSE_TCP=true + - GREENLIGHT_VERSION=v23.08-56-g0c8094c-modded + - FM_CLN_EXTENSION_LISTEN_ADDRESS=0.0.0.0:10212 + ports: + - "0.0.0.0:19846:19846" + - 10012:10012 + - 10212:10212 + links: + - bitcoind + volumes: + - ./cln/dave-cln:/root/.lightning + - ./cln/dave-cln/setup_script.sh:/setup_script.sh + - ./cln/dave-cln/cln_vol/entrypoint.sh:/entrypoint.sh + + neo4j: + image: neo4j:4.4.9 + container_name: neo4j.sphinx + volumes: + - ./neo4j/data:/data:rw + - ./neo4j/logs:/logs:rw + - ./neo4j/plugins:/plugins + - ./neo4j/tmp/import:/var/lib/neo4j/import + - ./neo4j/conf:/var/lib/neo4j/conf/ + ports: + - 7474:7474 + - 7687:7687 + environment: + - NEO4J_AUTH=neo4j/test + - NEO4J_USER=neo4j + - NEO4J_PASS=test + - NEO4J_apoc_export_file_enabled=true + - NEO4J_apoc_import_file_enabled=true + - NEO4J_dbms_security_procedures_unrestricted=apoc.*,algo.* + - NEO4J_dbms_memory_heap_initial__size=64m + - NEO4J_dbms_memory_heap_max__size=256m + - NEO4J_apoc_uuid_enabled=true + - NEO4J_dbms_default__listen__address=0.0.0.0 + - NEO4J_dbms_connector_bolt_listen__address=0.0.0.0:7687 + - NEO4J_dbms_allow__upgrade=true + - NEO4J_dbms_default__database=neo4j + - NEO4JLABS_PLUGINS=["apoc"] + healthcheck: + test: [ "CMD", "/var/lib/neo4j/bin/cypher-shell", "-u", "${NEO4J_USER}", "-p", "${NEO4J_PASS}", "MATCH (n) RETURN n LIMIT 1" ] + interval: 10s + timeout: 10s + retries: 20 + + jarvis-backend: + image: sphinxlightning/sphinx-jarvis-backend:latest + container_name: jarvis-backend.sphinx + restart: on-failure + volumes: + - ./stakwork:/stakwork + - ./temp_images:/temp_images + - ./.env:/app/.env + environment: + - NEO4J_URI=bolt://neo4j:7687 + - NEO4J_USER=neo4j + - NEO4J_PASS=test + - STAKWORK_REQUEST_LOG_PATH=./ + - STAKWORK_ADD_NODE_URL=https://staging.stakwork.com/api/v1/projects + - STAKWORK_ADD_NODE_TOKEN=${STAKWORK_TOKEN} + - JARVIS_BACKEND_PORT=5000 + - AWS_ACCESS_KEY_ID=***** + - AWS_SECRET_ACCESS_KEY=***** + - AWS_S3_BUCKET_PATH=https://stakwork-uploads.s3.amazonaws.com/knowledge-graph-joe/content-images + - AWS_S3_REGION_NAME=us-east-1 + - RADAR_RSS_SCHEDULER_TIME_IN_SEC=5090000 + - RADAR_TWITTER_SCHEDULER_TIME_IN_SEC=tue,21,14 + - RADAR_YOUTUBE_SCHEDULER_TIME_IN_SEC=20 + - RADAR_REQUEST_TOKEN=${STAKWORK_TOKEN} + - RADAR_SCHEDULER_JOB=False + - RADAR_YOUTUBE_SCHEDULER_JOB=False + - RADAR_TWITTER_SCHEDULER_JOB=False + - RADAR_RSS_SCHEDULER_JOB=False + - RADAR_SCHEDULER_JOB_HOUR=14 + - RADAR_SCHEDULER_JOB_MINUTE=38 + - SECOND_BRAIN_GRAPH_URL=https://knowledge-graph.sphinx.chat/get_named_entities + - ELASTIC_URI=http://0.0.0.0:9200 + - ELASTIC_PASSWORD=test + - PUBLIC_GRAPH_RESULT_LIMIT=10 + - STAKWORK_ADD_EPISODE_URL=https://staging.stakwork.com/api/v1/projects + - RADAR_SCHEDULER_TIME_IN_SEC=5 + - RADAR_TWEET_WEBHOOK=https://stakwork.free.beeceptor.com/stakwork/api/v1/projects/v1/tweet + - RADAR_TOPIC_WEBHOOK=https://stakwork.free.beeceptor.com/stakwork/api/v1/projects/v1/tweet + - RADAR_REQUEST_URL=https://staging.stakwork.com/api/v1/projects + - SELF_GENERATING_GRAPH=1 + - MAX_PAYMENT_HIERARCY_DEPTH=2 + - AUDIO_TAGGING_WORKFLOW_ID=2551 + - SINGLE_AUDIO_OR_VIDEO_EPISODE_WORKFLOW_ID=2552 + - SINGLE_TWEET_WORKFLOW_ID=2553 + - WEBPAGE_TEXT_WORKFLOW_ID=2554 + - DOCUMENT_WORKFLOW_ID=2555 + - TRIBE_MESSAGE_WORKFLOW_ID=2556 + - TWEET_BY_AUTOR_WORKFLOW_ID=2557 + - TWEET_BY_TOPIC_WORKFLOW_ID=2558 + - GITHUB_ISSUE_WORKFLOW_ID=2559 + - YOUTUBE_BY_CHANNEL_WORKFLOW_ID=2550 + - RSS_FEED_WORKFLOW_ID=2561 + - TUTORIAL_GENERATOR_WORKFLOW_ID=2562 + - INSTAGRAPH_GENERATOR_WORKFLOW_ID=2563 + - QUESTION_AND_ANSWER_WORKFLOW_ID=2564 + - TLDR_WORKFLOW_ID=8262 + - TWITTER_BEARER=${TWITTER_BEARER} + - TLDR_REQUEST_URL=https://staging.stakwork.com/api/v1/projects + - FEATURE_FLAG_SCHEMA=true + ports: + - 5000:5000 + links: + - neo4j \ No newline at end of file diff --git a/lnd/setup/index.js b/lnd/setup/index.js index e241a72..9dce3ca 100644 --- a/lnd/setup/index.js +++ b/lnd/setup/index.js @@ -12,6 +12,11 @@ if (process.env.CLN_PROXY === "true") { console.log("test cln proxy nodes!"); nodes = require("./nodes/clnProxyNodes"); } + +if (process.env.NAV_FIBER === "true") { + console.log("test NavFiber proxy nodes!"); + nodes = require("./nodes/navfiberNodes"); +} // if (process.env.DAVE_IP) { // if (nodes.nodes["dave"]) { // nodes.nodes["dave"].hostname = process.env.DAVE_IP; @@ -54,13 +59,15 @@ async function coins(node) { try { const balres = await lightning.getBalance(node); const confirmed = parseInt(balres.confirmed_balance); - console.log("=> ALICE confirmed balance:", confirmed); + console.log( + `=> ${node.alias.toLocaleUpperCase()} confirmed balance: ${confirmed}` + ); if (!confirmed) { const ares = await lightning.newAddress(node); const addy = ares.address; - console.log("=> ALICE address", addy); + console.log(`=> ${node.alias.toLocaleUpperCase()} address ${addy}`); await bitcoind.mine(101, addy); - console.log("=> 101 blocks mined to alice!", addy); + console.log(`=> 101 blocks mined to ${node.alias}! ${addy}`); await sleep(5000); } return true; @@ -90,7 +97,7 @@ async function channels(node) { console.log("=> 6 blocked mined to Alice!"); await sleep(20000); if (!channels.length) { - console.log("=> alice opening channels..."); + console.log(`=> ${node.alias} opening channels...`); // open channels here await asyncForEach(peersToMake, async (p) => { console.log("open channel with:", p); @@ -131,7 +138,11 @@ async function unlockAll() { await createOrUnlockWallet(node); }); await sleep(5000); - await coinsAndChannels(nodes.nodes.alice); + if (process.env.NAV_FIBER === "true") { + await coinsAndChannels(nodes.nodes.bob); + } else { + await coinsAndChannels(nodes.nodes.alice); + } } unlockAll(); diff --git a/lnd/setup/nodes/navfiberNodes.js b/lnd/setup/nodes/navfiberNodes.js new file mode 100644 index 0000000..399d36e --- /dev/null +++ b/lnd/setup/nodes/navfiberNodes.js @@ -0,0 +1,53 @@ +const macpath = ".lnd/data/chain/bitcoin/regtest/admin.macaroon"; + +const nodes = { + bob: { + alias: "bob", + hostname: "bob-lnd.sphinx:38882", + password: "bob12345", + type: "lnd", + macaroon: "/bob/" + macpath, + channels: [ + { + host: "dave-cln.sphinx:19846", + pubkey: + "037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3", + }, + ], + mnemonic: [ + "above", + "street", + "spoon", + "mercy", + "shoot", + "mammal", + "color", + "comic", + "distance", + "myself", + "buyer", + "response", + "senior", + "timber", + "attract", + "neither", + "half", + "laundry", + "ethics", + "swarm", + "will", + "boss", + "spoil", + "genius", + ], + }, + dave: { + alias: "dave", + type: "cln", + hostname: "dave-lnd.sphinx:38884", + }, +}; + +module.exports = { + nodes, +}; From f49d23eeeab945087537e18c8c11583a36eae9e7 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 29 May 2024 21:30:41 +0100 Subject: [PATCH 3/9] feat: relay setup --- alts/smaller-navfiber.yml | 3 +- boltwall/.env | 4 +- .../navfiber-proxy-nodes.partial.json | 16 ++++++ relay/setup/index.js | 55 +++++++++++++------ 4 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 relay/nodes_partial/navfiber-proxy-nodes.partial.json diff --git a/alts/smaller-navfiber.yml b/alts/smaller-navfiber.yml index 99d06e1..aa9edc6 100644 --- a/alts/smaller-navfiber.yml +++ b/alts/smaller-navfiber.yml @@ -153,9 +153,10 @@ services: entrypoint: ["node", "/relay/setup/index.js"] volumes: - ./relay:/relay - - ./relay/nodes_partial/cln_proxy_nodes_partial.json:/relay/nodes_partial.json + - ./relay/nodes_partial/navfiber-proxy-nodes.partial.json:/relay/nodes_partial.json environment: - DAVE_IP=http://host.docker.internal:3004 + - NAV_FIBER=true proxy: image: sphinxlightning/sphinx-proxy:latest diff --git a/boltwall/.env b/boltwall/.env index 8b7e0b0..d10c4bb 100644 --- a/boltwall/.env +++ b/boltwall/.env @@ -5,5 +5,5 @@ LIQUID_SERVER=http://demo1310255.mockable.io/ JARVIS_BACKEND_URL=http://jarvis-backend.sphinx:5000 HOST_URL=http://boltwall.sphinx:8444 ADMIN_TOKEN=navfiber_e2e_testing -LND_TLS_CERT="2d2d2d2d2d424547494e2043455254494649434154452d2d2d2d2d0a4d4949434e544343416475674177494241674952414b445450696c716741526d6b7533362b675854776a4177436759494b6f5a497a6a3045417749774f4445660a4d4230474131554543684d576247356b494746316447396e5a57356c636d46305a57516759325679644445564d424d474131554541784d4d4e7a67775a6a4d310a596d4d32597a63344d423458445449304d4449794d4445344d6a6b304d316f58445449314d4451784e6a45344d6a6b304d316f774f4445664d423047413155450a43684d576247356b494746316447396e5a57356c636d46305a57516759325679644445564d424d474131554541784d4d4e7a67775a6a4d31596d4d32597a63340a4d466b77457759484b6f5a497a6a3043415159494b6f5a497a6a3044415163445167414554543644466868566f51466f4c6a7a4f78413332306f4b67423136490a44436a5a46434a4b4a732b2b6a7579743667417150376f6c572b484633436d586131426e414a54385266654d784e636868672b59764536416f364f42785443420a776a414f42674e56485138424166384542414d4341715177457759445652306c42417777436759494b775942425155484177457744775944565230544151482f0a42415577417745422f7a416442674e564851344546675155696173376d71506f514a6937644841587537366c485656624a6263776177594456523052424751770a596f494d4e7a67775a6a4d31596d4d32597a633467676c7362324e686247687663335343446d4a7659693173626d51756333426f6157353467675231626d6c340a67677031626d6c346347466a613256306767646964575a6a623235756877522f41414142687841414141414141414141414141414141414141414142687753730a457741484d416f4743437147534d343942414d43413067414d45554349514434646359325a2f5a595752656e6834784e6569584f762b4f4f49472b63547966550a363759593769516e557749674d68415a6138303759684c6c446c6653674868336c76597474793455625443662b4b53705a664374364d413d0a2d2d2d2d2d454e442043455254494649434154452d2d2d2d2d0a" -LND_MACAROON="0201036c6e6402f801030a106a074f718e5cc93c3d32ed6d78be66ab1201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e65726174651204726561640000062002a1e34a10842443c2fbc89c34a3c0c3f264004ff42cf3a0b52256e5fea715dd" \ No newline at end of file +LND_TLS_CERT="2d2d2d2d2d424547494e2043455254494649434154452d2d2d2d2d0a4d4949434e44434341647167417749424167495147766a70304a474c71366e5468492b7a444f476d587a414b42676771686b6a4f50515144416a41344d5238770a485159445651514b45785a73626d5167595856306232646c626d56795958526c5a43426a5a584a304d5255774577594456515144457777794d545a6959574a6c0a5a44526c4e6a4d774868634e4d6a51774e5449344d6a41794e4441785768634e4d6a55774e7a497a4d6a41794e444178576a41344d523877485159445651514b0a45785a73626d5167595856306232646c626d56795958526c5a43426a5a584a304d5255774577594456515144457777794d545a6959574a6c5a44526c4e6a4d770a5754415442676371686b6a4f5051494242676771686b6a4f50514d4242774e43414151717a37426133363563347838696232736d58387067417a51616c3538740a7677716e5074624453706f4d5449344b43442b44374f3867486f6a63544a5a6a686f6f5a7055656152306a542f794b764d596842415468646f3448464d4948430a4d41344741315564447745422f775145417749437044415442674e56485355454444414b4267677242674546425163444154415042674e5648524d42416638450a425441444151482f4d4230474131556444675157424254775977625043343543332f387875575376787a6563417851303654427242674e56485245455a4442690a676777794d545a6959574a6c5a44526c4e6a4f4343577876593246736147397a6449494f596d39694c5778755a43357a63476870626e694342485675615869430a436e56756158687759574e725a58534342324a315a6d4e76626d36484248384141414748454141414141414141414141414141414141414141414748424b77540a41415177436759494b6f5a497a6a3045417749445341417752514968414a6d4a452f586b332b533373446d584b376d69424738464b2b54645a495369444c444e0a4b5061376d4e4d6341694148775776326c7a496f6966336467686450754c7071395255733377694e2f5977317332394e2f54544178513d3d0a2d2d2d2d2d454e442043455254494649434154452d2d2d2d2d0a" +LND_MACAROON="0201036c6e6402f801030a10a156a36c67297c693374572d12ff9ecd1201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620bc747b0980ab2dd0980d4120062e4e67360d33fcb67bef595640e0ce2fd18e13" \ No newline at end of file diff --git a/relay/nodes_partial/navfiber-proxy-nodes.partial.json b/relay/nodes_partial/navfiber-proxy-nodes.partial.json new file mode 100644 index 0000000..8d1d048 --- /dev/null +++ b/relay/nodes_partial/navfiber-proxy-nodes.partial.json @@ -0,0 +1,16 @@ +[ + { + "alias": "bob", + "pubkey": "02a38857848aca6b32ebcc3c85d07ee41354988f4f1e0b4e6ccd255eee6ed75b8d", + "ip": "http://bob.sphinx:3002", + "external_ip": "http://localhost:3002" + }, + { + "alias": "dave", + "pubkey": "037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3", + "ip": "http://dave.sphinx:3004", + "external_ip": "http://localhost:3004", + "proxy_ip": "http://proxy.sphinx:5050", + "admin_token": "r46bnf8ibrhbb424heba" + } +] diff --git a/relay/setup/index.js b/relay/setup/index.js index 195525e..3c26d6b 100644 --- a/relay/setup/index.js +++ b/relay/setup/index.js @@ -24,6 +24,20 @@ async function setup() { } } } + + if (process.env.NAV_FIBER) { + let change = true; + index = 1; + while (change) { + if (nodes[index]) { + nodes[index].ip = process.env.DAVE_IP; + index += 1; + } else { + change = false; + } + } + } + await asyncForEach(nodes, async function (n, i) { await pollReady(n, i); await sleep(1000); @@ -36,30 +50,35 @@ async function setup() { if we do not have any generated yet this comes in handy when a person fresh installs the sphinx-stack*/ - botEnvVars = require(paths.botEnvVars); - botConfig = require(paths.botConfig); + if (!process.env.NAV_FIBER) { + botEnvVars = require(paths.botEnvVars); + botConfig = require(paths.botConfig); - if (botEnvVars.length != botConfig.length) { - var finalNodes = require(paths.pathToWrite); + if (botEnvVars.length != botConfig.length) { + var finalNodes = require(paths.pathToWrite); - let newBotEnvVars = []; + let newBotEnvVars = []; - await asyncForEach(botConfig, async function (botConfigValues, botIndex) { - function sleep(ms) { - return new Promise((resolve) => setTimeout(resolve, ms)); - } + await asyncForEach(botConfig, async function (botConfigValues, botIndex) { + function sleep(ms) { + return new Promise((resolve) => setTimeout(resolve, ms)); + } - await sleep(20000); - const nextKeyPortPair = await createBotKey( - botConfigValues, - botIndex, - finalNodes[0] - ); + await sleep(20000); + const nextKeyPortPair = await createBotKey( + botConfigValues, + botIndex, + finalNodes[0] + ); - newBotEnvVars[botIndex] = nextKeyPortPair; - }); + newBotEnvVars[botIndex] = nextKeyPortPair; + }); - fs.writeFileSync(paths.botEnvVars, JSON.stringify(newBotEnvVars, null, 2)); + fs.writeFileSync( + paths.botEnvVars, + JSON.stringify(newBotEnvVars, null, 2) + ); + } } console.log("======================================"); From 3a499756e6ca379e9b71bf9b496f1c5feda88e6f Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Wed, 29 May 2024 21:54:59 +0100 Subject: [PATCH 4/9] feat: dave setup --- alts/smaller-navfiber.yml | 2 +- boltwall/.env | 4 +-- relay/navfiber-cln-dave.json | 62 ++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 relay/navfiber-cln-dave.json diff --git a/alts/smaller-navfiber.yml b/alts/smaller-navfiber.yml index aa9edc6..278aaec 100644 --- a/alts/smaller-navfiber.yml +++ b/alts/smaller-navfiber.yml @@ -129,7 +129,7 @@ services: [ "node", "/relay/dist/app.js", - "--config=/relay/configs/cln-dave.json", + "--config=/relay/configs/navfiber-cln-dave.json", "--db=/relay/configs/dave-db.json", ] volumes: diff --git a/boltwall/.env b/boltwall/.env index d10c4bb..2f9cc59 100644 --- a/boltwall/.env +++ b/boltwall/.env @@ -5,5 +5,5 @@ LIQUID_SERVER=http://demo1310255.mockable.io/ JARVIS_BACKEND_URL=http://jarvis-backend.sphinx:5000 HOST_URL=http://boltwall.sphinx:8444 ADMIN_TOKEN=navfiber_e2e_testing -LND_TLS_CERT="2d2d2d2d2d424547494e2043455254494649434154452d2d2d2d2d0a4d4949434e44434341647167417749424167495147766a70304a474c71366e5468492b7a444f476d587a414b42676771686b6a4f50515144416a41344d5238770a485159445651514b45785a73626d5167595856306232646c626d56795958526c5a43426a5a584a304d5255774577594456515144457777794d545a6959574a6c0a5a44526c4e6a4d774868634e4d6a51774e5449344d6a41794e4441785768634e4d6a55774e7a497a4d6a41794e444178576a41344d523877485159445651514b0a45785a73626d5167595856306232646c626d56795958526c5a43426a5a584a304d5255774577594456515144457777794d545a6959574a6c5a44526c4e6a4d770a5754415442676371686b6a4f5051494242676771686b6a4f50514d4242774e43414151717a37426133363563347838696232736d58387067417a51616c3538740a7677716e5074624453706f4d5449344b43442b44374f3867486f6a63544a5a6a686f6f5a7055656152306a542f794b764d596842415468646f3448464d4948430a4d41344741315564447745422f775145417749437044415442674e56485355454444414b4267677242674546425163444154415042674e5648524d42416638450a425441444151482f4d4230474131556444675157424254775977625043343543332f387875575376787a6563417851303654427242674e56485245455a4442690a676777794d545a6959574a6c5a44526c4e6a4f4343577876593246736147397a6449494f596d39694c5778755a43357a63476870626e694342485675615869430a436e56756158687759574e725a58534342324a315a6d4e76626d36484248384141414748454141414141414141414141414141414141414141414748424b77540a41415177436759494b6f5a497a6a3045417749445341417752514968414a6d4a452f586b332b533373446d584b376d69424738464b2b54645a495369444c444e0a4b5061376d4e4d6341694148775776326c7a496f6966336467686450754c7071395255733377694e2f5977317332394e2f54544178513d3d0a2d2d2d2d2d454e442043455254494649434154452d2d2d2d2d0a" -LND_MACAROON="0201036c6e6402f801030a10a156a36c67297c693374572d12ff9ecd1201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620bc747b0980ab2dd0980d4120062e4e67360d33fcb67bef595640e0ce2fd18e13" \ No newline at end of file +LND_TLS_CERT="2d2d2d2d2d424547494e2043455254494649434154452d2d2d2d2d0a4d4949434e4443434164716741774942416749514c557a6244634f6d4e4f4e686f70707457384933366a414b42676771686b6a4f50515144416a41344d5238770a485159445651514b45785a73626d5167595856306232646c626d56795958526c5a43426a5a584a304d5255774577594456515144457777314f544e6a5a6d51320a5a544e694d6a51774868634e4d6a51774e5449344d6a41304d7a49345768634e4d6a55774e7a497a4d6a41304d7a4934576a41344d523877485159445651514b0a45785a73626d5167595856306232646c626d56795958526c5a43426a5a584a304d5255774577594456515144457777314f544e6a5a6d51325a544e694d6a51770a5754415442676371686b6a4f5051494242676771686b6a4f50514d4242774e434141524c5965765668507173313668515a4f46466f764e4f76376c47526f54480a4d314154314732534c58526b7349534d62503141493231424d6542754e3354474e74547168506543756a506654756a43664d4c7a4a7638546f3448464d4948430a4d41344741315564447745422f775145417749437044415442674e56485355454444414b4267677242674546425163444154415042674e5648524d42416638450a425441444151482f4d42304741315564446751574242533538464a7a774e746f7354655431586d4e316b75775a38466f507a427242674e56485245455a4442690a676777314f544e6a5a6d51325a544e694d6a534343577876593246736147397a6449494f596d39694c5778755a43357a63476870626e694342485675615869430a436e56756158687759574e725a58534342324a315a6d4e76626d36484248384141414748454141414141414141414141414141414141414141414748424b77540a41415177436759494b6f5a497a6a30454177494453414177525149674b50656a72544a726f485967567764425a55305a586f74534c676663434a2b4a7078666e0a777153532b7241434951445836376b72796a6d70324f473741736f3738486378787371435075504b442b35556659575a324b38506b773d3d0a2d2d2d2d2d454e442043455254494649434154452d2d2d2d2d0a" +LND_MACAROON="0201036c6e6402f801030a1067dc385bfefce0057efcc3fa5a61d4ff1201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e6572617465120472656164000006200b90cff8acc156013b241c9d7ff606e72f620db1fd75c3867d32a58d7f241cff" \ No newline at end of file diff --git a/relay/navfiber-cln-dave.json b/relay/navfiber-cln-dave.json new file mode 100644 index 0000000..8303c38 --- /dev/null +++ b/relay/navfiber-cln-dave.json @@ -0,0 +1,62 @@ +{ + "development": { + "lightning_provider": "CLN", + "hub_api_url": "None", + "proxy_initial_sats": 20000, + "proxy_new_nodes": 10, + "proxy_lnd_ip": "proxy.sphinx", + "proxy_admin_token": "r46bnf8ibrhbb424heba", + "proxy_admin_url": "http://proxy.sphinx:5050", + "dont_ping_hub": true, + "proxy_lnd_port": "11111", + "proxy_tls_location": "/proxy/cert/tls.cert", + "proxy_macaroons_dir": "/proxy/macaroons", + "node_ip": "127.0.0.1", + "lnd_ip": "dave-cln.sphinx", + "lnd_port": "10012", + "cln_ca_cert": "/relay/dave/regtest/ca.pem", + "cln_device_key": "/relay/dave/regtest/client-key.pem", + "cln_device_cert": "/relay/dave/regtest/client.pem", + "node_http_protocol": "http", + "node_http_port": "3004", + "tribes_mqtt_port": "1883", + "tribes_insecure": true, + "public_url": "127.0.0.1:3004", + "connect_ui": true, + "logging_level": "debug", + "proxy_hd_keys": true, + "allow_swarm_invite": true, + "host_name": "localhost:3004", + "media_host": "meme.sphinx:5555" + }, + "gitactionenv": { + "lightning_provider": "CLN", + "hub_api_url": "None", + "proxy_initial_sats": 20000, + "proxy_new_nodes": 10, + "proxy_lnd_ip": "proxy.sphinx", + "proxy_admin_token": "r46bnf8ibrhbb424heba", + "proxy_admin_url": "http://proxy.sphinx:5050", + "dont_ping_hub": true, + "proxy_lnd_port": "11111", + "proxy_tls_location": "/proxy/cert/tls.cert", + "proxy_macaroons_dir": "/proxy/macaroons", + "node_ip": "127.0.0.1", + "lnd_ip": "dave-cln.sphinx", + "lnd_port": "10012", + "cln_ca_cert": "/relay/dave/regtest/ca.pem", + "cln_device_key": "/relay/dave/regtest/client-key.pem", + "cln_device_cert": "/relay/dave/regtest/client.pem", + "node_http_protocol": "http", + "node_http_port": "3004", + "tribes_mqtt_port": "1883", + "tribes_insecure": true, + "public_url": "127.0.0.1:3004", + "connect_ui": true, + "logging_level": "debug", + "proxy_hd_keys": true, + "allow_swarm_invite": true, + "host_name": "localhost:3004", + "media_host": "meme.sphinx:5555" + } +} From e3ed1b6588e8d8fefbc3ea9e96e7a20123891503 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Thu, 30 May 2024 22:05:39 +0100 Subject: [PATCH 5/9] update: switched to use lnd instead of cln --- alts/smaller-navfiber.yml | 89 +++++-------------- boltwall/.env | 4 +- lnd/setup/nodes/navfiberNodes.js | 34 ++++++- ...fiber-cln-dave.json => navfiber-dave.json} | 24 +++-- .../navfiber-proxy-nodes.partial.json | 2 +- 5 files changed, 67 insertions(+), 86 deletions(-) rename relay/{navfiber-cln-dave.json => navfiber-dave.json} (71%) diff --git a/alts/smaller-navfiber.yml b/alts/smaller-navfiber.yml index 278aaec..af8e70e 100644 --- a/alts/smaller-navfiber.yml +++ b/alts/smaller-navfiber.yml @@ -25,11 +25,23 @@ services: - 38882:38882 command: --configfile=/lndsetup/bob.conf + dave-lnd: + image: lightninglabs/lnd:v0.14.3-beta.rc1 + container_name: dave-lnd.sphinx + volumes: + - ./lnd/dave/.lnd:/root/.lnd + - ./lnd/setup:/lndsetup + ports: + - 9738:9735 + - 10012:10012 + - 38884:38884 + command: --configfile=/lndsetup/dave.conf + lndsetup: image: node:12-buster-slim depends_on: - bob-lnd - - dave-cln + - dave-lnd restart: "no" entrypoint: ["node", "/lndsetup/index.js"] volumes: @@ -72,25 +84,6 @@ services: ports: - 5433:5432 - meme: - image: sphinxlightning/sphinx-meme:0.2.2 - container_name: meme.sphinx - restart: on-failure - depends_on: - - db - volumes: - - ./memes:/app/files - environment: - - PORT=5555 - - JWT_KEY=19e0bb49bhyuibme - - STORAGE_MODE=local - - LOCAL_DIR=app/files - - LOCAL_ENCRYPTION_KEY=88303a55f5829d9e35936364204bcb007fe330db649902fa1085a7bce3732347 - - HOST=meme.sphinx:5555 - - DATABASE_URL=postgres://postgres:sphinx@db.sphinx:5432/postgres?sslmode=disable - ports: - - 5555:5555 - bob: image: sphinxlightning/sphinx-relay container_name: bob.sphinx @@ -116,25 +109,25 @@ services: - 3002:3002 extra_hosts: - "host.docker.internal:host-gateway" - + dave: image: sphinxlightning/sphinx-relay container_name: dave.sphinx user: root restart: on-failure depends_on: - - dave-cln + - dave-lnd - proxy entrypoint: [ "node", "/relay/dist/app.js", - "--config=/relay/configs/navfiber-cln-dave.json", + "--config=/relay/configs/navfiber-dave.json", "--db=/relay/configs/dave-db.json", ] volumes: - ./relay:/relay/configs - - ./cln/dave-cln/regtest:/relay/dave/regtest + - ./lnd/dave/.lnd:/relay/dave/.lnd - ./proxy:/proxy environment: - NODE_ENV=${GITACTION_ENV:-development} @@ -164,13 +157,12 @@ services: restart: always user: root depends_on: - - dave-cln + - dave-lnd volumes: - ./lnd/dave/.lnd:/lnd/.lnd - ./proxy/cert:/cert - ./proxy/macaroons:/macaroons - ./proxy/badger:/badger - - ./cln/dave-cln/regtest:/cln/creds - type: bind source: ./proxy/lnd_proxy.conf target: /lnd_proxy.conf @@ -189,21 +181,16 @@ services: "--channels-start=2", "--admin-token=r46bnf8ibrhbb424heba", "--admin-port=5050", - "--admin-pubkey=037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3", + "--admin-pubkey=030841d1519f19c68e80efc5ef5af3460ca4bfa17486fda9baca878b9ef255358f", "--initial-msat=500000", + "--macaroon-location=/lnd/.lnd/data/chain/bitcoin/regtest/admin.macaroon", + "--tls-location=/lnd/.lnd/tls.cert", + "--lnd-ip=dave-lnd.sphinx", + "--lnd-port=10012", "--mqtt-broker=tcps://mqtt.sphinx:1883", "--topic-uuid=YLkmJR_jaWBRICt21_IG01sopeqvE_8JUv3NXbBV9egjj2Y9AFf8iTmugbxtlxcnNc-RjYpbdN9E_vMWm4LHXTCbhL4O", "--tlsextradomain=proxy.sphinx", "--use-hd-keys", - "--mode=cln", - "--cln-ca-cert=/cln/creds/ca.pem", - "--cln-client-cert=/cln/creds/client.pem", - "--cln-client-key=/cln/creds/client-key.pem", - "--cln-ip=dave-cln.sphinx", - "--cln-port=10012", - "--cln-server-name=cln", - "--htlc-interceptor-ip=dave-cln.sphinx", - "--htlc-interceptor-port=10212", ] ports: - 11111:11111 @@ -229,36 +216,6 @@ services: - ./boltwall/.env:/boltwall/.env - ./lnd:/lnd - dave-cln: - image: sphinxlightning/cln-sphinx:latest - container_name: dave-cln.sphinx - command: - - --addr=0.0.0.0:19846 - - --bitcoin-rpcconnect=bitcoind.sphinx - - --bitcoin-rpcport=18443 - - --bitcoin-rpcuser=evan - - --bitcoin-rpcpassword=thepass - - --network=regtest - - --log-level=debug - - --alias=dave-cln - - --grpc-port=10012 - - --accept-htlc-tlv-type=133773310 - - --plugin=/usr/local/libexec/c-lightning/plugins/gateway-cln-extension - environment: - - EXPOSE_TCP=true - - GREENLIGHT_VERSION=v23.08-56-g0c8094c-modded - - FM_CLN_EXTENSION_LISTEN_ADDRESS=0.0.0.0:10212 - ports: - - "0.0.0.0:19846:19846" - - 10012:10012 - - 10212:10212 - links: - - bitcoind - volumes: - - ./cln/dave-cln:/root/.lightning - - ./cln/dave-cln/setup_script.sh:/setup_script.sh - - ./cln/dave-cln/cln_vol/entrypoint.sh:/entrypoint.sh - neo4j: image: neo4j:4.4.9 container_name: neo4j.sphinx diff --git a/boltwall/.env b/boltwall/.env index 2f9cc59..64b893e 100644 --- a/boltwall/.env +++ b/boltwall/.env @@ -5,5 +5,5 @@ LIQUID_SERVER=http://demo1310255.mockable.io/ JARVIS_BACKEND_URL=http://jarvis-backend.sphinx:5000 HOST_URL=http://boltwall.sphinx:8444 ADMIN_TOKEN=navfiber_e2e_testing -LND_TLS_CERT="2d2d2d2d2d424547494e2043455254494649434154452d2d2d2d2d0a4d4949434e4443434164716741774942416749514c557a6244634f6d4e4f4e686f70707457384933366a414b42676771686b6a4f50515144416a41344d5238770a485159445651514b45785a73626d5167595856306232646c626d56795958526c5a43426a5a584a304d5255774577594456515144457777314f544e6a5a6d51320a5a544e694d6a51774868634e4d6a51774e5449344d6a41304d7a49345768634e4d6a55774e7a497a4d6a41304d7a4934576a41344d523877485159445651514b0a45785a73626d5167595856306232646c626d56795958526c5a43426a5a584a304d5255774577594456515144457777314f544e6a5a6d51325a544e694d6a51770a5754415442676371686b6a4f5051494242676771686b6a4f50514d4242774e434141524c5965765668507173313668515a4f46466f764e4f76376c47526f54480a4d314154314732534c58526b7349534d62503141493231424d6542754e3354474e74547168506543756a506654756a43664d4c7a4a7638546f3448464d4948430a4d41344741315564447745422f775145417749437044415442674e56485355454444414b4267677242674546425163444154415042674e5648524d42416638450a425441444151482f4d42304741315564446751574242533538464a7a774e746f7354655431586d4e316b75775a38466f507a427242674e56485245455a4442690a676777314f544e6a5a6d51325a544e694d6a534343577876593246736147397a6449494f596d39694c5778755a43357a63476870626e694342485675615869430a436e56756158687759574e725a58534342324a315a6d4e76626d36484248384141414748454141414141414141414141414141414141414141414748424b77540a41415177436759494b6f5a497a6a30454177494453414177525149674b50656a72544a726f485967567764425a55305a586f74534c676663434a2b4a7078666e0a777153532b7241434951445836376b72796a6d70324f473741736f3738486378787371435075504b442b35556659575a324b38506b773d3d0a2d2d2d2d2d454e442043455254494649434154452d2d2d2d2d0a" -LND_MACAROON="0201036c6e6402f801030a1067dc385bfefce0057efcc3fa5a61d4ff1201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e6572617465120472656164000006200b90cff8acc156013b241c9d7ff606e72f620db1fd75c3867d32a58d7f241cff" \ No newline at end of file +LND_TLS_CERT="2d2d2d2d2d424547494e2043455254494649434154452d2d2d2d2d0a4d4949434e6a434341647567417749424167495241495a726954305678747534303658396f6e755055687377436759494b6f5a497a6a3045417749774f4445660a4d4230474131554543684d576247356b494746316447396e5a57356c636d46305a57516759325679644445564d424d474131554541784d4d4f444268595455330a4d444e6a4e6a55334d423458445449304d4455794f5449774d444d314d466f58445449314d4463794e4449774d444d314d466f774f4445664d423047413155450a43684d576247356b494746316447396e5a57356c636d46305a57516759325679644445564d424d474131554541784d4d4f444268595455334d444e6a4e6a55330a4d466b77457759484b6f5a497a6a3043415159494b6f5a497a6a304441516344516741457133326d32306567394e4b557564433167624d4d4d6e474b6e442f4c0a2f38513142744d7a35586d6c38532b4f636464636b4b4f614753424947306366707333396f7275346e4365424f544378467546754e786973614b4f42785443420a776a414f42674e56485138424166384542414d4341715177457759445652306c42417777436759494b775942425155484177457744775944565230544151482f0a42415577417745422f7a416442674e5648513445466751556b6147424f445937415a38413062396a486d4d2b4a347039473934776177594456523052424751770a596f494d4f444268595455334d444e6a4e6a553367676c7362324e686247687663335343446d4a7659693173626d51756333426f6157353467675231626d6c340a67677031626d6c346347466a613256306767646964575a6a623235756877522f41414142687841414141414141414141414141414141414141414142687753730a457741444d416f4743437147534d343942414d4341306b414d4559434951432f4c4b356f6248654e5a61686b333871782f58325667742f474a64744e2b4c544a0a646b4c797570712b49774968414d7558536e47596c5843496d6f306e327a6f54413147396e4730457055714b386e417359696d4c4f6b6f330a2d2d2d2d2d454e442043455254494649434154452d2d2d2d2d0a" +LND_MACAROON="0201036c6e6402f801030a1089a3fd7efb6ed457a80ecbeef8af5fcc1201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e65726174651204726561640000062016e3ebc0fe4e88e11f7cdfe2bb0b9b8467843c4cc76e736db894394d9a76eafa" \ No newline at end of file diff --git a/lnd/setup/nodes/navfiberNodes.js b/lnd/setup/nodes/navfiberNodes.js index 399d36e..2b768a0 100644 --- a/lnd/setup/nodes/navfiberNodes.js +++ b/lnd/setup/nodes/navfiberNodes.js @@ -9,9 +9,9 @@ const nodes = { macaroon: "/bob/" + macpath, channels: [ { - host: "dave-cln.sphinx:19846", + host: "dave-lnd.sphinx:9735", pubkey: - "037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3", + "030841d1519f19c68e80efc5ef5af3460ca4bfa17486fda9baca878b9ef255358f", }, ], mnemonic: [ @@ -43,8 +43,36 @@ const nodes = { }, dave: { alias: "dave", - type: "cln", + type: "lnd", hostname: "dave-lnd.sphinx:38884", + password: "dave12345", + macaroon: "/dave/" + macpath, + mnemonic: [ + "able", + "stuff", + "magic", + "beach", + "ankle", + "exotic", + "blood", + "capital", + "motor", + "crouch", + "once", + "pigeon", + "awake", + "same", + "ill", + "crane", + "write", + "resource", + "interest", + "rail", + "cigar", + "duty", + "body", + "outdoor", + ], }, }; diff --git a/relay/navfiber-cln-dave.json b/relay/navfiber-dave.json similarity index 71% rename from relay/navfiber-cln-dave.json rename to relay/navfiber-dave.json index 8303c38..2e153e9 100644 --- a/relay/navfiber-cln-dave.json +++ b/relay/navfiber-dave.json @@ -1,9 +1,8 @@ { "development": { - "lightning_provider": "CLN", "hub_api_url": "None", "proxy_initial_sats": 20000, - "proxy_new_nodes": 10, + "proxy_new_nodes": 4, "proxy_lnd_ip": "proxy.sphinx", "proxy_admin_token": "r46bnf8ibrhbb424heba", "proxy_admin_url": "http://proxy.sphinx:5050", @@ -12,11 +11,10 @@ "proxy_tls_location": "/proxy/cert/tls.cert", "proxy_macaroons_dir": "/proxy/macaroons", "node_ip": "127.0.0.1", - "lnd_ip": "dave-cln.sphinx", + "lnd_ip": "dave-lnd.sphinx", "lnd_port": "10012", - "cln_ca_cert": "/relay/dave/regtest/ca.pem", - "cln_device_key": "/relay/dave/regtest/client-key.pem", - "cln_device_cert": "/relay/dave/regtest/client.pem", + "tls_location": "/relay/dave/.lnd/tls.cert", + "macaroon_location": "/relay/dave/.lnd/data/chain/bitcoin/regtest/admin.macaroon", "node_http_protocol": "http", "node_http_port": "3004", "tribes_mqtt_port": "1883", @@ -26,14 +24,13 @@ "logging_level": "debug", "proxy_hd_keys": true, "allow_swarm_invite": true, - "host_name": "localhost:3004", + "host_name": "http://dave.sphinx:3004", "media_host": "meme.sphinx:5555" }, "gitactionenv": { - "lightning_provider": "CLN", "hub_api_url": "None", "proxy_initial_sats": 20000, - "proxy_new_nodes": 10, + "proxy_new_nodes": 4, "proxy_lnd_ip": "proxy.sphinx", "proxy_admin_token": "r46bnf8ibrhbb424heba", "proxy_admin_url": "http://proxy.sphinx:5050", @@ -42,11 +39,10 @@ "proxy_tls_location": "/proxy/cert/tls.cert", "proxy_macaroons_dir": "/proxy/macaroons", "node_ip": "127.0.0.1", - "lnd_ip": "dave-cln.sphinx", + "lnd_ip": "dave-lnd.sphinx", "lnd_port": "10012", - "cln_ca_cert": "/relay/dave/regtest/ca.pem", - "cln_device_key": "/relay/dave/regtest/client-key.pem", - "cln_device_cert": "/relay/dave/regtest/client.pem", + "tls_location": "/relay/dave/.lnd/tls.cert", + "macaroon_location": "/relay/dave/.lnd/data/chain/bitcoin/regtest/admin.macaroon", "node_http_protocol": "http", "node_http_port": "3004", "tribes_mqtt_port": "1883", @@ -56,7 +52,7 @@ "logging_level": "debug", "proxy_hd_keys": true, "allow_swarm_invite": true, - "host_name": "localhost:3004", + "host_name": "http://dave.sphinx:3004", "media_host": "meme.sphinx:5555" } } diff --git a/relay/nodes_partial/navfiber-proxy-nodes.partial.json b/relay/nodes_partial/navfiber-proxy-nodes.partial.json index 8d1d048..9067dbc 100644 --- a/relay/nodes_partial/navfiber-proxy-nodes.partial.json +++ b/relay/nodes_partial/navfiber-proxy-nodes.partial.json @@ -7,7 +7,7 @@ }, { "alias": "dave", - "pubkey": "037ec785c6004d512ebaeb0020f81a2bcdb6fccc9539f7b891f704289ebc65a4e3", + "pubkey": "030841d1519f19c68e80efc5ef5af3460ca4bfa17486fda9baca878b9ef255358f", "ip": "http://dave.sphinx:3004", "external_ip": "http://localhost:3004", "proxy_ip": "http://proxy.sphinx:5050", From c6a30f3f3c0d992747a12f05278e666453af585f Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 31 May 2024 21:14:18 +0100 Subject: [PATCH 6/9] update: removed mqtt and auth server --- alts/smaller-navfiber.yml | 33 --------------------------------- boltwall/.env | 4 +++- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/alts/smaller-navfiber.yml b/alts/smaller-navfiber.yml index af8e70e..9cf2cf1 100644 --- a/alts/smaller-navfiber.yml +++ b/alts/smaller-navfiber.yml @@ -51,39 +51,6 @@ services: environment: - NAV_FIBER=true - auth: - image: sphinxlightning/sphinx-auth:0.2.3 - container_name: auth.sphinx - restart: on-failure - depends_on: - - db - environment: - - JWT_KEY=19e0bb49bhyuibme - - HOST=localhost:9090 - ports: - - 9090:9090 - - mqtt: - image: sphinxlightning/sphinx-mqtt:test-2 - container_name: mqtt.sphinx - restart: on-failure - depends_on: - - auth - ports: - - 1883:1883 - db: - image: postgres - container_name: db.sphinx - restart: on-failure - environment: - - POSTGRES_PASSWORD=sphinx - - POSTGRES_USER=postgres - volumes: - - ./init.sql:/docker-entrypoint-initdb.d/init.sql - - ./pgdata:/var/lib/postgresql/data - ports: - - 5433:5432 - bob: image: sphinxlightning/sphinx-relay container_name: bob.sphinx diff --git a/boltwall/.env b/boltwall/.env index ca084b6..5777630 100644 --- a/boltwall/.env +++ b/boltwall/.env @@ -4,4 +4,6 @@ LND_SOCKET=bob-lnd.sphinx:10010 LIQUID_SERVER=http://demo1310255.mockable.io/ JARVIS_BACKEND_URL=http://jarvis-backend.sphinx:5000 HOST_URL=http://boltwall.sphinx:8444 -ADMIN_TOKEN=navfiber_e2e_testing \ No newline at end of file +ADMIN_TOKEN=navfiber_e2e_testing +LND_TLS_CERT="2d2d2d2d2d424547494e2043455254494649434154452d2d2d2d2d0a4d4949434e5443434164756741774942416749524149722b67535636665857636b436e5569666755504f6f77436759494b6f5a497a6a3045417749774f4445660a4d4230474131554543684d576247356b494746316447396e5a57356c636d46305a57516759325679644445564d424d474131554541784d4d5a44686b5a6d4a6a0a4d6d45794d32457a4d423458445449304d44557a4d4449774d4467304e566f58445449314d4463794e5449774d4467304e566f774f4445664d423047413155450a43684d576247356b494746316447396e5a57356c636d46305a57516759325679644445564d424d474131554541784d4d5a44686b5a6d4a6a4d6d45794d32457a0a4d466b77457759484b6f5a497a6a3043415159494b6f5a497a6a30444151634451674145306f666862703336664d312f48596e4d6b393445626257696b762b650a5a6c5557546c32644877622b496457547a6e587a7139496e526b58436e7447374c685a725541767a2b4736534b4653666e6e44574e714d4546614f42785443420a776a414f42674e56485138424166384542414d4341715177457759445652306c42417777436759494b775942425155484177457744775944565230544151482f0a42415577417745422f7a416442674e56485134454667515556356a3151456e6d582f49426348553372306d75446f7471685338776177594456523052424751770a596f494d5a44686b5a6d4a6a4d6d45794d32457a67676c7362324e686247687663335343446d4a7659693173626d51756333426f6157353467675231626d6c340a67677031626d6c346347466a613256306767646964575a6a623235756877522f41414142687841414141414141414141414141414141414141414142687753730a457741464d416f4743437147534d343942414d43413067414d4555434951446b42506b3562525653633532542b68414c3336436f766e744f69736474666e6f680a30524676753467506a67496751522f41516150537a546655424d5745555a7342657934637a3947624679744a6e37506e755363444a30773d0a2d2d2d2d2d454e442043455254494649434154452d2d2d2d2d0a" +LND_MACAROON="0201036c6e6402f801030a1002ed2989fd3732c2f0b9e0096301854e1201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620e64d521e8c2b59144c09593439d5b7bf51af46f846cf5fbc8f35cb3ef4466d57" \ No newline at end of file From 6234b0df6cffbba6f964e13c4375d5f46fe53b69 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 31 May 2024 23:06:06 +0100 Subject: [PATCH 7/9] update: retuen auth and mqtt --- alts/smaller-navfiber.yml | 33 +++++++++++++++++++++++++++++++++ boltwall/.env | 4 ++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/alts/smaller-navfiber.yml b/alts/smaller-navfiber.yml index 9cf2cf1..af8e70e 100644 --- a/alts/smaller-navfiber.yml +++ b/alts/smaller-navfiber.yml @@ -51,6 +51,39 @@ services: environment: - NAV_FIBER=true + auth: + image: sphinxlightning/sphinx-auth:0.2.3 + container_name: auth.sphinx + restart: on-failure + depends_on: + - db + environment: + - JWT_KEY=19e0bb49bhyuibme + - HOST=localhost:9090 + ports: + - 9090:9090 + + mqtt: + image: sphinxlightning/sphinx-mqtt:test-2 + container_name: mqtt.sphinx + restart: on-failure + depends_on: + - auth + ports: + - 1883:1883 + db: + image: postgres + container_name: db.sphinx + restart: on-failure + environment: + - POSTGRES_PASSWORD=sphinx + - POSTGRES_USER=postgres + volumes: + - ./init.sql:/docker-entrypoint-initdb.d/init.sql + - ./pgdata:/var/lib/postgresql/data + ports: + - 5433:5432 + bob: image: sphinxlightning/sphinx-relay container_name: bob.sphinx diff --git a/boltwall/.env b/boltwall/.env index 5777630..a128479 100644 --- a/boltwall/.env +++ b/boltwall/.env @@ -5,5 +5,5 @@ LIQUID_SERVER=http://demo1310255.mockable.io/ JARVIS_BACKEND_URL=http://jarvis-backend.sphinx:5000 HOST_URL=http://boltwall.sphinx:8444 ADMIN_TOKEN=navfiber_e2e_testing -LND_TLS_CERT="2d2d2d2d2d424547494e2043455254494649434154452d2d2d2d2d0a4d4949434e5443434164756741774942416749524149722b67535636665857636b436e5569666755504f6f77436759494b6f5a497a6a3045417749774f4445660a4d4230474131554543684d576247356b494746316447396e5a57356c636d46305a57516759325679644445564d424d474131554541784d4d5a44686b5a6d4a6a0a4d6d45794d32457a4d423458445449304d44557a4d4449774d4467304e566f58445449314d4463794e5449774d4467304e566f774f4445664d423047413155450a43684d576247356b494746316447396e5a57356c636d46305a57516759325679644445564d424d474131554541784d4d5a44686b5a6d4a6a4d6d45794d32457a0a4d466b77457759484b6f5a497a6a3043415159494b6f5a497a6a30444151634451674145306f666862703336664d312f48596e4d6b393445626257696b762b650a5a6c5557546c32644877622b496457547a6e587a7139496e526b58436e7447374c685a725541767a2b4736534b4653666e6e44574e714d4546614f42785443420a776a414f42674e56485138424166384542414d4341715177457759445652306c42417777436759494b775942425155484177457744775944565230544151482f0a42415577417745422f7a416442674e56485134454667515556356a3151456e6d582f49426348553372306d75446f7471685338776177594456523052424751770a596f494d5a44686b5a6d4a6a4d6d45794d32457a67676c7362324e686247687663335343446d4a7659693173626d51756333426f6157353467675231626d6c340a67677031626d6c346347466a613256306767646964575a6a623235756877522f41414142687841414141414141414141414141414141414141414142687753730a457741464d416f4743437147534d343942414d43413067414d4555434951446b42506b3562525653633532542b68414c3336436f766e744f69736474666e6f680a30524676753467506a67496751522f41516150537a546655424d5745555a7342657934637a3947624679744a6e37506e755363444a30773d0a2d2d2d2d2d454e442043455254494649434154452d2d2d2d2d0a" -LND_MACAROON="0201036c6e6402f801030a1002ed2989fd3732c2f0b9e0096301854e1201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620e64d521e8c2b59144c09593439d5b7bf51af46f846cf5fbc8f35cb3ef4466d57" \ No newline at end of file +LND_TLS_CERT="2d2d2d2d2d424547494e2043455254494649434154452d2d2d2d2d0a4d4949434e544343416475674177494241674952414f52643149327a4a6d544b4246566c676d49524e734577436759494b6f5a497a6a3045417749774f4445660a4d4230474131554543684d576247356b494746316447396e5a57356c636d46305a57516759325679644445564d424d474131554541784d4d4d5464694f5755300a5a4755354d6a4d324d423458445449304d44557a4d4449784e546b304d466f58445449314d4463794e5449784e546b304d466f774f4445664d423047413155450a43684d576247356b494746316447396e5a57356c636d46305a57516759325679644445564d424d474131554541784d4d4d5464694f5755305a4755354d6a4d320a4d466b77457759484b6f5a497a6a3043415159494b6f5a497a6a304441516344516741455855777058443570443737723250432b584b75435a62434a476161320a712b56724e5764573265396c7230786b775059315739465337633371694b4c66396a674b65304331744e304744425675627a51395173396b35614f42785443420a776a414f42674e56485138424166384542414d4341715177457759445652306c42417777436759494b775942425155484177457744775944565230544151482f0a42415577417745422f7a416442674e56485134454667515578363259756b4538424a4d66465a514a754730535276596d587938776177594456523052424751770a596f494d4d5464694f5755305a4755354d6a4d3267676c7362324e686247687663335343446d4a7659693173626d51756333426f6157353467675231626d6c340a67677031626d6c346347466a613256306767646964575a6a623235756877522f41414142687841414141414141414141414141414141414141414142687753730a457741474d416f4743437147534d343942414d43413067414d455543494762785a39516a56305753785a346779536b376e356b6a77656835756b644a674135430a66712f526446546e416945417a794e47456865794554753333594e36567a36455355454d38504f5538643649314c7479493176314876593d0a2d2d2d2d2d454e442043455254494649434154452d2d2d2d2d0a" +LND_MACAROON="0201036c6e6402f801030a10fc1a4239d1d17144d8d41a2f7b3ab8ae1201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620f58e3ee1deb8942c7b497d87fb47660f93ff0b1fa71ee562348f18fa21029ca9" \ No newline at end of file From 9ec8b0f2014b61a850a88459168d2a447b7e8355 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Fri, 31 May 2024 23:51:54 +0100 Subject: [PATCH 8/9] update: removed default boltwall config --- boltwall/.env | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/boltwall/.env b/boltwall/.env index a128479..ca084b6 100644 --- a/boltwall/.env +++ b/boltwall/.env @@ -4,6 +4,4 @@ LND_SOCKET=bob-lnd.sphinx:10010 LIQUID_SERVER=http://demo1310255.mockable.io/ JARVIS_BACKEND_URL=http://jarvis-backend.sphinx:5000 HOST_URL=http://boltwall.sphinx:8444 -ADMIN_TOKEN=navfiber_e2e_testing -LND_TLS_CERT="2d2d2d2d2d424547494e2043455254494649434154452d2d2d2d2d0a4d4949434e544343416475674177494241674952414f52643149327a4a6d544b4246566c676d49524e734577436759494b6f5a497a6a3045417749774f4445660a4d4230474131554543684d576247356b494746316447396e5a57356c636d46305a57516759325679644445564d424d474131554541784d4d4d5464694f5755300a5a4755354d6a4d324d423458445449304d44557a4d4449784e546b304d466f58445449314d4463794e5449784e546b304d466f774f4445664d423047413155450a43684d576247356b494746316447396e5a57356c636d46305a57516759325679644445564d424d474131554541784d4d4d5464694f5755305a4755354d6a4d320a4d466b77457759484b6f5a497a6a3043415159494b6f5a497a6a304441516344516741455855777058443570443737723250432b584b75435a62434a476161320a712b56724e5764573265396c7230786b775059315739465337633371694b4c66396a674b65304331744e304744425675627a51395173396b35614f42785443420a776a414f42674e56485138424166384542414d4341715177457759445652306c42417777436759494b775942425155484177457744775944565230544151482f0a42415577417745422f7a416442674e56485134454667515578363259756b4538424a4d66465a514a754730535276596d587938776177594456523052424751770a596f494d4d5464694f5755305a4755354d6a4d3267676c7362324e686247687663335343446d4a7659693173626d51756333426f6157353467675231626d6c340a67677031626d6c346347466a613256306767646964575a6a623235756877522f41414142687841414141414141414141414141414141414141414142687753730a457741474d416f4743437147534d343942414d43413067414d455543494762785a39516a56305753785a346779536b376e356b6a77656835756b644a674135430a66712f526446546e416945417a794e47456865794554753333594e36567a36455355454d38504f5538643649314c7479493176314876593d0a2d2d2d2d2d454e442043455254494649434154452d2d2d2d2d0a" -LND_MACAROON="0201036c6e6402f801030a10fc1a4239d1d17144d8d41a2f7b3ab8ae1201301a160a0761646472657373120472656164120577726974651a130a04696e666f120472656164120577726974651a170a08696e766f69636573120472656164120577726974651a210a086d616361726f6f6e120867656e6572617465120472656164120577726974651a160a076d657373616765120472656164120577726974651a170a086f6666636861696e120472656164120577726974651a160a076f6e636861696e120472656164120577726974651a140a057065657273120472656164120577726974651a180a067369676e6572120867656e657261746512047265616400000620f58e3ee1deb8942c7b497d87fb47660f93ff0b1fa71ee562348f18fa21029ca9" \ No newline at end of file +ADMIN_TOKEN=navfiber_e2e_testing \ No newline at end of file From 92d0b3e0794ba1b1ad6fdc21085875ff45eb0ed6 Mon Sep 17 00:00:00 2001 From: Oluwatobi Bamidele Date: Sat, 1 Jun 2024 00:33:57 +0100 Subject: [PATCH 9/9] update: remove auth, mqtt and postgres --- alts/smaller-navfiber.yml | 62 +++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/alts/smaller-navfiber.yml b/alts/smaller-navfiber.yml index af8e70e..cf591af 100644 --- a/alts/smaller-navfiber.yml +++ b/alts/smaller-navfiber.yml @@ -51,38 +51,38 @@ services: environment: - NAV_FIBER=true - auth: - image: sphinxlightning/sphinx-auth:0.2.3 - container_name: auth.sphinx - restart: on-failure - depends_on: - - db - environment: - - JWT_KEY=19e0bb49bhyuibme - - HOST=localhost:9090 - ports: - - 9090:9090 + # auth: + # image: sphinxlightning/sphinx-auth:0.2.3 + # container_name: auth.sphinx + # restart: on-failure + # depends_on: + # - db + # environment: + # - JWT_KEY=19e0bb49bhyuibme + # - HOST=localhost:9090 + # ports: + # - 9090:9090 - mqtt: - image: sphinxlightning/sphinx-mqtt:test-2 - container_name: mqtt.sphinx - restart: on-failure - depends_on: - - auth - ports: - - 1883:1883 - db: - image: postgres - container_name: db.sphinx - restart: on-failure - environment: - - POSTGRES_PASSWORD=sphinx - - POSTGRES_USER=postgres - volumes: - - ./init.sql:/docker-entrypoint-initdb.d/init.sql - - ./pgdata:/var/lib/postgresql/data - ports: - - 5433:5432 + # mqtt: + # image: sphinxlightning/sphinx-mqtt:test-2 + # container_name: mqtt.sphinx + # restart: on-failure + # depends_on: + # - auth + # ports: + # - 1883:1883 + # db: + # image: postgres + # container_name: db.sphinx + # restart: on-failure + # environment: + # - POSTGRES_PASSWORD=sphinx + # - POSTGRES_USER=postgres + # volumes: + # - ./init.sql:/docker-entrypoint-initdb.d/init.sql + # - ./pgdata:/var/lib/postgresql/data + # ports: + # - 5433:5432 bob: image: sphinxlightning/sphinx-relay