getProxyRootPubkey with CLN support

kevkevinpal · Apr 26, 2023 · c874ab1 · c874ab1
1 parent 4fb8167
commit c874ab1
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 34 deletions.
diff --git a/dist/src/grpc/lightning.js b/dist/src/grpc/lightning.js
diff --git a/dist/src/grpc/lightning.js.map b/dist/src/grpc/lightning.js.map
diff --git a/dist/src/utils/proxy.js b/dist/src/utils/proxy.js
diff --git a/dist/src/utils/proxy.js.map b/dist/src/utils/proxy.js.map
diff --git a/src/grpc/lightning.ts b/src/grpc/lightning.ts
@@ -97,7 +97,7 @@ export function loadCredentials(macName?: string): grpc.ChannelCredentials {
   }
 }
 
-const loadMtlsCredentials = () => {
+export const loadMtlsCredentials = () => {
   const glCert = fs.readFileSync(config.cln_ca_cert)
   const glPriv = fs.readFileSync(config.cln_device_key)
   const glChain = fs.readFileSync(config.cln_device_cert)

diff --git a/src/utils/proxy.ts b/src/utils/proxy.ts
@@ -14,6 +14,7 @@ import { Op } from 'sequelize'
 const config = loadConfig()
 const LND_IP = config.lnd_ip || 'localhost'
 const PROXY_LND_IP = config.proxy_lnd_ip || 'localhost'
+const IS_CLN = config.lightning_provider === 'CLN'
 
 const check_proxy_balance = false
 
@@ -210,19 +211,46 @@ export function getProxyRootPubkey(): Promise<string> {
       resolve(proxyRootPubkey)
       return
     }
-    // normal client, to get pubkey of LND
-    const credentials = Lightning.loadCredentials()
-    const lnrpcDescriptor = loadProto('lightning')
-    const lnrpc = lnrpcDescriptor.lnrpc
-    const lc = new lnrpc.Lightning(LND_IP + ':' + config.lnd_port, credentials)
-    lc.getInfo({}, function (err, response) {
-      if (err == null && response) {
-        proxyRootPubkey = response.identity_pubkey
-        resolve(proxyRootPubkey)
-      } else {
-        reject('CANT GET ROOT KEY')
+
+    if (IS_CLN) {
+      const credentials = Lightning.loadMtlsCredentials()
+      const descriptor = loadProto('cln/node')
+      const cln = descriptor.cln
+      const options = {
+        'grpc.ssl_target_name_override': 'cln',
       }
-    })
+      const clnClient = new cln.Node(
+        LND_IP + ':' + config.lnd_port,
+        credentials,
+        options
+      )
+      clnClient.getinfo({}, function (err, response) {
+        if (response && err == null) {
+          const pubkey = Buffer.from(response.id).toString('hex')
+          proxyRootPubkey = pubkey
+          resolve(proxyRootPubkey)
+        } else {
+          reject(err)
+        }
+      })
+    } else {
+      // normal client, to get pubkey of LND or CLN
+      const credentials = Lightning.loadCredentials()
+      const lnrpcDescriptor = loadProto('lightning')
+      const lnrpc = lnrpcDescriptor.lnrpc
+      const lc = new lnrpc.Lightning(
+        LND_IP + ':' + config.lnd_port,
+        credentials
+      )
+      lc.getInfo({}, function (err, response) {
+        if (err == null && response) {
+          proxyRootPubkey = response.identity_pubkey
+          resolve(proxyRootPubkey)
+        } else {
+          reject('CANT GET ROOT KEY')
+        }
+      })
+    }
   })
 }
 

diff --git a/testing/cln/alice.json b/testing/cln/alice.json
@@ -13,6 +13,15 @@
     "tribes_host": "localhost:13000",
     "tribes_mqtt_port": "1883",
     "tribes_insecure": true,
-    "public_url": "127.0.0.1:3001"
+    "public_url": "127.0.0.1:3001",
+    "proxy_initial_sats": 1000,
+    "proxy_new_nodes": 0,
+    "proxy_lnd_ip": "127.0.0.1",
+    "proxy_admin_token": "d86hnf8irgbcv093jdns",
+    "proxy_admin_url": "http://localhost:5555",
+    "dont_ping_hub": true,
+    "proxy_lnd_port": "11111",
+    "proxy_tls_location": "/Users/evanfeenstra/code/sphinx/sphinx-proxy/cert/tls.cert",
+    "proxy_macaroons_dir": "/Users/evanfeenstra/code/sphinx/sphinx-proxy/macaroons"
   }
 }
diff --git a/testing/cln/readme.md b/testing/cln/readme.md
@@ -1,7 +1,11 @@
-**alice**
+**alice proxy CLN**
 
 in sphinx-swarm run `cargo run --bin cln`
 
+in sphinx-rs/vls-mqtt use local .env and `cargo run`
+
 in sphinx-proxy run `./cln/creds.sh`
 
+`./sphinx-proxy --mode cln`
+
 node ./dist/app.js --config="/Users/evanfeenstra/code/sphinx/sphinx-relay/testing/cln/alice.json" --db="/Users/evanfeenstra/code/sphinx/sphinx-relay/testing/cln/alice-db.json"