Merge pull request #25 from RadarTech/cf-cc-559-proto-pull-fixes

Proto persistence & subscription default fixes

.gitignore

@@ -1,5 +1,5 @@
 node_modules
 yarn-error.log
 .esm-cache
-rpc.proto
+/rpc.proto
 *.macaroon

README.md

@@ -27,6 +27,12 @@ Install [lnd](https://github.com/lightningnetwork/lnd/blob/master/docs/INSTALL.m
 To change the gRPC definitions used for all auto-generated types and RPC methods edit the `config.lnd_release_tag` value in `package.json` to the desired [LND release tag](https://github.com/lightningnetwork/lnd/releases) and run the following:
 
 ```sh
+npm run update-proto
+# OR
+yarn update-proto
+
+# AND
+
 npm run generate
 # OR
 yarn generate

generate_types.sh

@@ -9,7 +9,7 @@ PROTOC_VERSION=$2
 # Clone LND release and extract rpc.proto
 yarn
 rm -f ./rpc.proto
-node lib/proto-sanitizer.js "./node_modules/lnd#${LND_RELEASE_TAG}/lnrpc/rpc.proto" "./rpc.proto"
+node lib/proto-sanitizer.js "./lnd/${LND_RELEASE_TAG}/rpc.proto" "./rpc.proto"
 
 GENERATED_TYPES_DIR=types/generated
 if [ -d "$GENERATED_TYPES_DIR" ]

lib/lightning.js

@@ -57,9 +57,12 @@ module.exports = function createLightningProxy(
     get(target, key) {
       const method = target[key];
 
-      if (typeof method !== 'function' || subscriptionMethods.includes(key)) {
+      if (typeof method !== 'function') {
         return target[key]; // forward
       } else {
+        if (subscriptionMethods.includes(key)) {
+          return defaultEmptyArg(method);
+        }
         return promisify(defaultEmptyArg(method));
       }
     },

lib/lnrpc.js

@@ -3,7 +3,7 @@ const pkgDir = require('pkg-dir');
 const {join} = require('path');
 const {promisify} = require('util');
 const protoLoader = require('@grpc/proto-loader');
-const GRPC = require('@grpc/grpc-js');
+const GRPC = require('grpc');
 const createLightning = require('./lightning');
 const createWalletUnlocker = require('./wallet-unlocker');
 const readFile = promisify(fs.readFile);
@@ -38,8 +38,7 @@ module.exports = async function createLnRpc(config = {}) {
   const rootPath = await pkgDir(__dirname);
   const protoSrc = join(
     rootPath,
-    `node_modules/lnd#${packageJson.config['lnd-release-tag']}` +
-      `/lnrpc/rpc.proto`,
+    `lnd/${packageJson.config['lnd-release-tag']}/rpc.proto`,
   );
   const protoDest = join(rootPath, 'rpc.proto');