Merge pull request #283 from lightninglabs/mailbox

app: add mailbox support

Author: jamaljsr

.github/workflows/main.yml

@@ -168,3 +168,6 @@ jobs:
 
       - name: run check
         run: make protos-check
+
+      - name: compile rpc for golang
+        run: make rpc

.gitignore

@@ -2,6 +2,7 @@
 .env*.local
 
 litd-debug
+litcli-debug
 /lightning-terminal-*
 
 # MacOS junk

Dockerfile

@@ -64,6 +64,7 @@ EXPOSE 8443 10009 9735
 
 # Copy the binaries and entrypoint from the builder image.
 COPY --from=golangbuilder /go/bin/litd /bin/
+COPY --from=golangbuilder /go/bin/litcli /bin/
 COPY --from=golangbuilder /go/bin/lncli /bin/
 COPY --from=golangbuilder /go/bin/frcli /bin/
 COPY --from=golangbuilder /go/bin/loop /bin/

Makefile

@@ -108,10 +108,12 @@ install: app-build go-install
 go-build:
 	@$(call print, "Building lightning-terminal.")
 	$(GOBUILD) -tags="$(LND_RELEASE_TAGS)" -ldflags "$(LDFLAGS)" -o litd-debug $(PKG)/cmd/litd
+	$(GOBUILD) -tags="$(LND_RELEASE_TAGS)" -ldflags "$(LDFLAGS)" -o litcli-debug $(PKG)/cmd/litcli
 
 go-install:
 	@$(call print, "Installing lightning-terminal.")
 	$(GOINSTALL) -tags="$(LND_RELEASE_TAGS)" -ldflags "$(LDFLAGS)" $(PKG)/cmd/litd
+	$(GOINSTALL) -tags="$(LND_RELEASE_TAGS)" -ldflags "$(LDFLAGS)" $(PKG)/cmd/litcli
 
 go-install-cli:
 	@$(call print, "Installing all CLI binaries.")
@@ -193,6 +195,10 @@ list:
 		grep -v Makefile | \
 		sort
 
+rpc:
+	@$(call print, "Compiling protos.")
+	cd ./litrpc; ./gen_protos_docker.sh
+
 protos:
 	@$(call print, "Compiling protos.")
 	cd proto; ./gen_protos_docker.sh

app/package.json

@@ -21,7 +21,7 @@
     "@emotion/styled": "11.3.0",
     "@improbable-eng/grpc-web": "0.14.0",
     "big.js": "6.1.1",
-    "bootstrap": "4.5.0",
+    "bootstrap": "4.6.1",
     "copy-to-clipboard": "3.3.1",
     "d3": "6.3.1",
     "date-fns": "2.14.0",
@@ -81,8 +81,8 @@
     "google-protobuf": "3.12.2",
     "jest-canvas-mock": "2.3.0",
     "jest-environment-jsdom-sixteen": "1.0.3",
-    "node-sass": "4.14.1",
     "prettier": "2.1.2",
+    "sass": "1.43.4",
     "ts-protoc-gen": "0.12.0",
     "typescript": "4.1.6"
   },

app/scripts/build-protos.js

@@ -50,11 +50,30 @@ const protoSources = async () => {
 
 /** list of proto files and patches to apply */
 const filePatches = {
-  lnd: 'lnrpc: {}',
-  loop: 'looprpc: {}',
-  common: 'looprpc: {}',
-  trader: 'poolrpc: {}',
-  'auctioneerrpc/auctioneer': 'poolrpc: {}',
+  lnd: {
+    patch: 'lnrpc: {}',
+    folder: 'proto'
+  },
+  loop: {
+    patch: 'looprpc: {}',
+    folder: 'proto'
+  },
+  common: {
+    patch: 'looprpc: {}',
+    folder: 'proto'
+  },
+  trader: {
+    patch: 'poolrpc: {}',
+    folder: 'proto'
+  },
+  'auctioneerrpc/auctioneer': {
+    patch: 'poolrpc: {}',
+    folder: 'proto'
+  },
+  'lit-sessions': {
+    patch: 'litrpc: {}',
+    folder: 'litrpc'
+  }
 };
 
 /**
@@ -86,7 +105,7 @@ const download = async () => {
  */
 const sanitize = async () => {
   const filePaths = Object.keys(filePatches).map(name =>
-    join(appPath, '..', 'proto', `${name}.proto`),
+    join(appPath, '..', filePatches[name].folder, `${name}.proto`),
   );
   for (path of filePaths) {
     let content = (await fs.readFile(path)).toString();
@@ -113,14 +132,18 @@ const generate = async () => {
     '.bin',
     platform() === 'win32' ? 'protoc-gen-ts.cmd' : 'protoc-gen-ts',
   );
+  const files = Object
+      .keys(filePatches)
+      .map(name => `../${filePatches[name].folder}/${name}.proto`);
   const protocCmd = [
     'protoc',
     `-I../proto`,
+    `-I../litrpc`,
     `--plugin=protoc-gen-ts=${protocGen}`,
     '--proto_path=../proto',
     '--js_out=import_style=commonjs,binary:./src/types/generated',
     '--ts_out=service=grpc-web:./src/types/generated',
-    ...Object.keys(filePatches).map(file => `../proto/${file}.proto`),
+    ...files,
   ].join(' ');
 
   console.log(protocCmd);
@@ -153,7 +176,7 @@ const patch = async () => {
     // apply the webpack patch
     const patch = [
       '/* eslint-disable */',
-      `var proto = { ${filePatches[filename]} };`,
+      `var proto = { ${filePatches[filename].patch} };`,
       '',
     ].join('\n');
     content = `${patch}\n${content}`;

app/src/Routes.tsx

@@ -10,6 +10,7 @@ const LazyLoopPage = React.lazy(() => import('components/loop/LoopPage'));
 const LazyHistoryPage = React.lazy(() => import('components/history/HistoryPage'));
 const LazyPoolPage = React.lazy(() => import('components/pool/PoolPage'));
 const LazySettingsPage = React.lazy(() => import('components/settings/SettingsPage'));
+const LazyConnectPage = React.lazy(() => import('components/connect/ConnectPage'));
 
 const Routes: React.FC = () => {
   const { router } = useStore();
@@ -26,6 +27,7 @@ const Routes: React.FC = () => {
                   <Route path={`${PUBLIC_URL}/history`} component={LazyHistoryPage} />
                   <Route path={`${PUBLIC_URL}/pool`} component={LazyPoolPage} />
                   <Route path={`${PUBLIC_URL}/settings`} component={LazySettingsPage} />
+                  <Route path={`${PUBLIC_URL}/connect`} component={LazyConnectPage} />
                 </Suspense>
               </Switch>
             </Layout>

app/src/__tests__/components/layout/Layout.spec.tsx

@@ -39,9 +39,9 @@ describe('Layout component', () => {
     fireEvent.click(getByText('History'));
     expect(store.router.location.pathname).toBe('/history');
     expect(getByText('History').parentElement).toHaveClass('active');
-    fireEvent.click(getByText('Lightning Terminal'));
+    fireEvent.click(getByText('Lightning Loop'));
     expect(store.router.location.pathname).toBe('/loop');
-    expect(getByText('Lightning Terminal').parentElement).toHaveClass('active');
+    expect(getByText('Lightning Loop').parentElement).toHaveClass('active');
   });
 
   it('should navigate to the Pool page', () => {
@@ -50,9 +50,9 @@ describe('Layout component', () => {
     fireEvent.click(getByText('Lightning Pool'));
     expect(store.router.location.pathname).toBe('/pool');
     expect(getByText('Lightning Pool').parentElement).toHaveClass('active');
-    fireEvent.click(getByText('Lightning Terminal'));
+    fireEvent.click(getByText('Lightning Loop'));
     expect(store.router.location.pathname).toBe('/loop');
-    expect(getByText('Lightning Terminal').parentElement).toHaveClass('active');
+    expect(getByText('Lightning Loop').parentElement).toHaveClass('active');
   });
 
   it('should navigate to the Settings page', () => {
@@ -61,8 +61,8 @@ describe('Layout component', () => {
     fireEvent.click(getByText('Settings'));
     expect(store.router.location.pathname).toBe('/settings');
     expect(getByText('Settings').parentElement).toHaveClass('active');
-    fireEvent.click(getByText('Lightning Terminal'));
+    fireEvent.click(getByText('Lightning Loop'));
     expect(store.router.location.pathname).toBe('/loop');
-    expect(getByText('Lightning Terminal').parentElement).toHaveClass('active');
+    expect(getByText('Lightning Loop').parentElement).toHaveClass('active');
   });
 });

app/src/__tests__/components/loop/LoopPage.spec.tsx

@@ -33,7 +33,7 @@ describe('LoopPage component', () => {
 
   it('should display the page title', () => {
     const { getByText } = render();
-    expect(getByText('Lightning Terminal')).toBeInTheDocument();
+    expect(getByText('Lightning Loop')).toBeInTheDocument();
   });
 
   it('should display the network badge', () => {

app/src/api/index.ts

@@ -2,3 +2,4 @@ export { default as GrpcClient } from './grpc';
 export { default as LndApi } from './lnd';
 export { default as LoopApi } from './loop';
 export { default as PoolApi } from './pool';
+export { default as LitApi } from './lit';