Merge pull request #1721 from kaloudis/lsp-simple-taproot-channels

LSP: add ability to request Simple Taproot Channels
ZeusLN · Oct 3, 2023 · 240a2fb · 240a2fb
2 parents 75e9bb3 + 2ae0535
commit 240a2fb
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 10 deletions.
diff --git a/locales/en.json b/locales/en.json
@@ -725,6 +725,7 @@
     "views.Settings.LSP.enableLSP": "Enable Lightning Service Provider (LSP)",
     "views.Settings.LSP.enableLSP.subtitle": "The LSP will get you connected to the Lightning network by opening up payment channels for you.",
     "views.Settings.LSP.lspAccessKey": "LSP Access Key (if needed)",
+    "views.Settings.LSP.requestSimpleTaproot": "Request Simple Taproot Channels",
     "views.Settings.AddContact.name": "Name",
     "views.Settings.AddContact.description": "Description (max 120)",
     "views.Settings.AddContact.lnAddress": "LN address",

diff --git a/stores/LSPStore.ts b/stores/LSPStore.ts
@@ -185,24 +185,24 @@ export default class LSPStore {
         this.error = false;
         this.error_msg = '';
         this.showLspSettings = false;
+
+        const { settings } = this.settingsStore;
+
         return new Promise((resolve, reject) => {
             ReactNativeBlobUtil.fetch(
                 'post',
                 `${this.getLSPHost()}/api/v1/proposal`,
-                this.settingsStore.settings.lspAccessKey
+                settings.lspAccessKey
                     ? {
                           'Content-Type': 'application/json',
-                          'x-auth-token':
-                              this.settingsStore.settings.lspAccessKey
+                          'x-auth-token': settings.lspAccessKey
                       }
                     : {
                           'Content-Type': 'application/json'
                       },
                 JSON.stringify({
                     bolt11,
-                    // TODO investigate why Taproot chans from LSP
-                    // result in unsettled funds
-                    simpleTaproot: false
+                    simpleTaproot: settings.requestSimpleTaproot
                 })
             )
                 .then(async (response: any) => {

diff --git a/stores/SettingsStore.ts b/stores/SettingsStore.ts
@@ -108,6 +108,7 @@ export interface Settings {
     lspMainnet: string;
     lspTestnet: string;
     lspAccessKey: string;
+    requestSimpleTaproot: boolean;
 }
 
 export const FIAT_RATES_SOURCE_KEYS = [
@@ -718,7 +719,8 @@ export default class SettingsStore {
         enableLSP: true,
         lspMainnet: DEFAULT_LSP_MAINNET,
         lspTestnet: DEFAULT_LSP_TESTNET,
-        lspAccessKey: ''
+        lspAccessKey: '',
+        requestSimpleTaproot: false
     };
     @observable public posStatus: string = 'unselected';
     @observable public loading = false;

diff --git a/views/Settings/LSP.tsx b/views/Settings/LSP.tsx
@@ -22,6 +22,7 @@ interface EmbeddedNodeState {
     enableLSP: boolean | undefined;
     lsp: string;
     accessKey: string;
+    requestSimpleTaproot: boolean;
 }
 
 @inject('SettingsStore')
@@ -33,7 +34,8 @@ export default class EmbeddedNode extends React.Component<
     state = {
         enableLSP: true,
         lsp: '',
-        accessKey: ''
+        accessKey: '',
+        requestSimpleTaproot: false
     };
 
     async UNSAFE_componentWillMount() {
@@ -46,13 +48,14 @@ export default class EmbeddedNode extends React.Component<
                 embeddedLndNetwork === 'Mainnet'
                     ? settings.lspMainnet
                     : settings.lspTestnet,
-            accessKey: settings.lspAccessKey
+            accessKey: settings.lspAccessKey,
+            requestSimpleTaproot: settings.requestSimpleTaproot
         });
     }
 
     render() {
         const { navigation, SettingsStore } = this.props;
-        const { enableLSP, lsp, accessKey } = this.state;
+        const { enableLSP, lsp, accessKey, requestSimpleTaproot } = this.state;
         const { updateSettings, embeddedLndNetwork }: any = SettingsStore;
 
         return (
@@ -184,6 +187,44 @@ export default class EmbeddedNode extends React.Component<
                             autoCorrect={false}
                         />
                     </View>
+                    <ListItem
+                        containerStyle={{
+                            borderBottomWidth: 0,
+                            backgroundColor: 'transparent'
+                        }}
+                    >
+                        <ListItem.Title
+                            style={{
+                                color: themeColor('secondaryText'),
+                                fontFamily: 'Lato-Regular'
+                            }}
+                        >
+                            {localeString(
+                                'views.Settings.LSP.requestSimpleTaproot'
+                            )}
+                        </ListItem.Title>
+                        <View
+                            style={{
+                                flex: 1,
+                                flexDirection: 'row',
+                                justifyContent: 'flex-end'
+                            }}
+                        >
+                            <Switch
+                                value={requestSimpleTaproot}
+                                onValueChange={async () => {
+                                    this.setState({
+                                        requestSimpleTaproot:
+                                            !requestSimpleTaproot
+                                    });
+                                    await updateSettings({
+                                        requestSimpleTaproot:
+                                            !requestSimpleTaproot
+                                    });
+                                }}
+                            />
+                        </View>
+                    </ListItem>
                 </View>
             </Screen>
         );