Merge pull request #1564 from ZeusLN/pegasus

Pegasus

.eslintignore

@@ -5,3 +5,4 @@ babel.config.js
 index.js
 metro.config.js
 shim.js
+proto

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -29,6 +29,7 @@ body:
       label: Zeus version
       description: What version of Zeus were you running when the bug occurred?
       options:
+        - v0.8.0
         - v0.7.7
         - v0.7.6
         - v0.7.5
@@ -43,6 +44,7 @@ body:
       label: Node interface
       description: Which node interfaces does this bug affect?
       options:
+        - Embedded LND
         - LND (REST)
         - LND (Lightning Node Connect)
         - Core Lightning (c-lightning-REST)

.gitignore

@@ -69,3 +69,7 @@ buck-out/
 # CocoaPods
 ios/Pods
 **.swp
+
+# Lnd binaries
+android/lndmobile/Lndmobile.aar
+ios/LncMobile/Lndmobile.xcframework

.prettierignore

@@ -0,0 +1 @@
+zeus_modules

App.tsx

@@ -1,10 +1,12 @@
 import * as React from 'react';
 import { Provider } from 'mobx-react';
+
 import Stores from './stores/Stores';
 import Navigation from './Navigation';
 import { AppContainer } from './components/layout/AppContainer';
 import ExternalLinkModal from './components/Modals/ExternalLinkModal';
 import AndroidNfcModal from './components/Modals/AndroidNfcModal';
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
 
 export default class App extends React.PureComponent {
     render() {
@@ -26,12 +28,17 @@ export default class App extends React.PureComponent {
                 ActivityStore={Stores.activityStore}
                 PosStore={Stores.posStore}
                 ModalStore={Stores.modalStore}
-                NotesStore={Stores.NotesStore}
+                NotesStore={Stores.notesStore}
+                SyncStore={Stores.syncStore}
+                LSPStore={Stores.lspStore}
+                ChannelBackupStore={Stores.channelBackupStore}
             >
                 <AppContainer>
-                    <Navigation />
-                    <ExternalLinkModal />
-                    <AndroidNfcModal />
+                    <GestureHandlerRootView style={{ flex: 1 }}>
+                        <Navigation />
+                        <ExternalLinkModal />
+                        <AndroidNfcModal />
+                    </GestureHandlerRootView>
                 </AppContainer>
             </Provider>
         );

Navigation.ts

@@ -22,6 +22,7 @@ import Invoice from './views/Invoice';
 
 import SparkQRScanner from './views/SparkQRScanner';
 import NodeInfo from './views/NodeInfo';
+import NetworkInfo from './views/NetworkInfo';
 import Lockscreen from './views/Lockscreen';
 
 // Settings views
@@ -51,6 +52,13 @@ import PointOfSaleRecon from './views/Settings/PointOfSaleRecon';
 import PointOfSaleReconExport from './views/Settings/PointOfSaleReconExport';
 import PaymentsSettings from './views/Settings/PaymentsSettings';
 import InvoicesSettings from './views/Settings/InvoicesSettings';
+import LSP from './views/Settings/LSP';
+//Embedded Node
+import EmbeddedNode from './views/Settings/EmbeddedNode';
+import DisasterRecovery from './views/Settings/EmbeddedNode/DisasterRecovery';
+import Pathfinding from './views/Settings/EmbeddedNode/Pathfinding';
+import ExpressGraphSync from './views/Settings/EmbeddedNode/ExpressGraphSync';
+import LNDLogs from './views/Settings/EmbeddedNode/LNDLogs';
 
 // Routing
 import Routing from './views/Routing/Routing';
@@ -77,6 +85,12 @@ import IntroSplash from './views/IntroSplash';
 
 import EditFee from './views/EditFee';
 
+// Embedded LND
+import Seed from './views/Settings/Seed';
+import Sync from './views/Sync';
+import LspExplanation from './views/LspExplanation';
+import LspExplanationRouting from './views/LspExplanationRouting';
+
 const AppScenes = {
     Wallet: {
         screen: Wallet
@@ -201,6 +215,9 @@ const AppScenes = {
     SendingLightning: {
         screen: SendingLightning
     },
+    NetworkInfo: {
+        screen: NetworkInfo
+    },
     NodeInfo: {
         screen: NodeInfo
     },
@@ -258,6 +275,12 @@ const AppScenes = {
     InvoicesSettings: {
         screen: InvoicesSettings
     },
+    Seed: {
+        screen: Seed
+    },
+    Sync: {
+        screen: Sync
+    },
     BumpFee: {
         screen: BumpFee
     },
@@ -266,6 +289,30 @@ const AppScenes = {
     },
     AddNotes: {
         screen: AddNotes
+    },
+    LspExplanation: {
+        screen: LspExplanation
+    },
+    LspExplanationRouting: {
+        screen: LspExplanationRouting
+    },
+    EmbeddedNodeSettings: {
+        screen: EmbeddedNode
+    },
+    DisasterRecovery: {
+        screen: DisasterRecovery
+    },
+    Pathfinding: {
+        screen: Pathfinding
+    },
+    ExpressGraphSync: {
+        screen: ExpressGraphSync
+    },
+    LNDLogs: {
+        screen: LNDLogs
+    },
+    LSPSettings: {
+        screen: LSP
     }
 };
 

android/app/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: "com.android.application"
+apply plugin: "com.google.protobuf"
 
 import com.android.build.OutputFile
 
@@ -131,8 +132,8 @@ android {
         applicationId "app.zeusln.zeus"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 76
-        versionName "0.7.7"
+        versionCode 77
+        versionName "0.8.0-alpha"
         multiDexEnabled true
         missingDimensionStrategy 'react-native-camera', 'general'
     }
@@ -191,10 +192,23 @@ android {
         pickFirst "lib/x86/libc++_shared.so"
         pickFirst "lib/x86_64/libc++_shared.so"
 
+        pickFirst "lib/armeabi-v7a/libgojni.so"
+        pickFirst "lib/arm64-v8a/libgojni.so"
+        pickFirst "lib/x86/libgojni.so"
+        pickFirst "lib/x86_64/libgojni.so"
+
         jniLibs {
             useLegacyPackaging true
         }
     }
+
+    sourceSets {
+        main {
+            proto {
+                srcDir '../../proto'
+            }
+        }
+    }
 }
 
 dependencies {
@@ -221,7 +235,23 @@ dependencies {
     } else {
         implementation jscFlavor
     }
-    implementation files("../../node_modules/@lightninglabs/lnc-rn/android/libs/lnc-mobile.aar")
+    // implementation files("../../android/lndmobile/Lndmobile.aar")
+
+    // Pegasus
+    implementation project(":lndmobile")
+    implementation "androidx.concurrent:concurrent-futures:1.1.0"
+    implementation "androidx.work:work-runtime:2.7.1"
+    implementation "androidx.concurrent:concurrent-futures:1.1.0"
+    implementation "com.google.guava:guava:31.0.1-android"
+    implementation "io.grpc:grpc-protobuf-lite:1.30.0"
+
+    implementation "com.jakewharton:process-phoenix:2.0.0"
+    implementation 'org.brotli:dec:0.1.2'
+}
+
+configurations {
+    // https://stackoverflow.com/questions/54717283/program-type-already-present-com-google-common-util-concurrent-listenablefuture
+    all*.exclude group: "com.google.guava", module: "listenablefuture"
 }
 
 // Run this once to be able to run the application with BUCK
@@ -233,5 +263,20 @@ task copyDownloadableDepsToLibs(type: Copy) {
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
 
+protobuf {
+    protoc {
+        artifact = "com.google.protobuf:protoc:21.0-rc-1"
+    }
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                java {
+                    option "lite"
+                }
+            }
+        }
+    }
+}
+
 apply plugin: "kotlin-android"
 apply plugin: "kotlin-android-extensions"

android/app/src/main/AndroidManifest.xml

@@ -127,6 +127,9 @@
             android:name="android.nfc.cardemulation.host_apdu_service"
             android:resource="@xml/aid_list" />
       </service>
+      <service
+        android:name=".LndMobileService"
+        android:exported="false" />
     </application>
 
 </manifest>