[feature] v0.9.0

.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.9.0
         - v0.8.4
         - v0.8.3
         - v0.8.2

Navigation.ts

@@ -98,7 +98,7 @@ import CoinControl from './views/UTXOs/CoinControl';
 import Utxo from './views/UTXOs/UTXO';
 import Accounts from './views/Accounts/Accounts';
 import ImportAccount from './views/Accounts/ImportAccount';
-import ImportAccountQRScanner from './views/Accounts/ImportAccountQRScanner';
+import ImportingAccount from './views/Accounts/ImportingAccount';
 import BumpFee from './views/BumpFee';
 import QR from './views/QR';
 import AddNotes from './views/AddNotes';
@@ -129,6 +129,9 @@ import RawTxHex from './views/RawTxHex';
 
 import CustodialWalletWarning from './views/Settings/CustodialWalletWarning';
 
+import PSBT from './views/PSBT';
+import TxHex from './views/TxHex';
+
 const AppScenes = {
     Wallet: {
         screen: Wallet
@@ -286,15 +289,15 @@ const AppScenes = {
     ImportAccount: {
         screen: ImportAccount
     },
+    ImportingAccount: {
+        screen: ImportingAccount
+    },
     HandleAnythingQRScanner: {
         screen: HandleAnythingQRScanner
     },
     NodeQRCodeScanner: {
         screen: NodeQRScanner
     },
-    ImportAccountQRScanner: {
-        screen: ImportAccountQRScanner
-    },
     SparkQRScanner: {
         screen: SparkQRScanner
     },
@@ -450,6 +453,12 @@ const AppScenes = {
     },
     CustodialWalletWarning: {
         screen: CustodialWalletWarning
+    },
+    PSBT: {
+        screen: PSBT
+    },
+    TxHex: {
+        screen: TxHex
     }
 };
 

android/app/build.gradle

@@ -101,7 +101,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 84
-        versionName "0.8.4-beta3"
+        versionName "0.9.0-alpha3"
         multiDexEnabled true
         missingDimensionStrategy 'react-native-camera', 'general'
     }

assets/images/SVG/DynamicSVG/MatiSvg.tsx

@@ -0,0 +1,32 @@
+import React from 'react';
+import { Svg, Circle, Path } from 'react-native-svg';
+import { themeColor } from '../../../../utils/ThemeUtils';
+
+export default function MatiSvg({ width = 70, height = 70 }) {
+    const svgProps = {
+        width: `${width}`,
+        height: `${height}`,
+        viewBox: '0 0 50 50',
+        fill: 'none',
+        xmlns: 'http://www.w3.org/2000/svg'
+    };
+
+    const circleProps = {
+        cx: '25',
+        cy: '25',
+        r: '20',
+        fill: themeColor('background')
+    };
+
+    const path1Props = {
+        d: 'M34.45 28.3045l-9.4486 4.6305L15.55 28.3045l4.1137 -2.0184c1.0616 1.8058 3.055 3.0196 5.3348 3.0196s4.2732 -1.2137 5.3348 -3.0196zM24.9986 17.065L15.55 21.6955l4.1137 2.0184c1.0616 -1.8058 3.0535 -3.0196 5.3348 -3.0196c2.2828 0 4.2732 1.2137 5.3348 3.0196L34.45 21.6955zM24.9986 23.0067c-1.1252 0 -2.0391 0.8933 -2.0391 1.9933s0.914 1.9948 2.0391 1.9948S27.0376 26.1001 27.0376 25s-0.914 -1.9933 -2.0391 -1.9933zM24.9986 23.0067',
+        fill: themeColor('chain')
+    };
+
+    return React.createElement(
+        Svg,
+        svgProps,
+        React.createElement(Circle, circleProps),
+        React.createElement(Path, path1Props)
+    );
+}

backends/CLightningREST.ts

@@ -272,5 +272,7 @@ export default class CLightningREST extends LND {
     supportsSimpleTaprootChannels = () => false;
     supportsCustomPreimages = () => false;
     supportsSweep = () => true;
+    supportsOnchainBatching = () => false;
+    supportsChannelBatching = () => false;
     isLNDBased = () => false;
 }

backends/Eclair.ts

@@ -504,6 +504,8 @@ export default class Eclair {
     supportsSimpleTaprootChannels = () => false;
     supportsCustomPreimages = () => false;
     supportsSweep = () => false;
+    supportsOnchainBatching = () => false;
+    supportsChannelBatching = () => false;
     isLNDBased = () => false;
 }
 

backends/EmbeddedLND.ts

@@ -4,6 +4,11 @@ import Base64Utils from './../utils/Base64Utils';
 
 import lndMobile from '../lndmobile/LndMobileInjection';
 
+import {
+    checkLndStreamErrorResponse,
+    LndMobileEventEmitter
+} from '../utils/LndMobileUtils';
+
 const {
     addInvoice,
     getInfo,
@@ -17,7 +22,8 @@ const {
     listPayments,
     getNetworkInfo,
     queryRoutes,
-    lookupInvoice
+    lookupInvoice,
+    fundingStateStep
 } = lndMobile.index;
 const {
     channelBalance,
@@ -26,26 +32,33 @@ const {
     pendingChannels,
     closedChannels,
     closeChannel,
-    openChannel
+    openChannel,
+    openChannelSync,
+    decodeOpenStatusUpdate
 } = lndMobile.channel;
 const {
     signMessageNodePubkey,
     verifyMessageNodePubkey,
     bumpFee,
     fundPsbt,
+    signPsbt,
     finalizePsbt,
-    publishTransaction
+    publishTransaction,
+    listAccounts,
+    importAccount
 } = lndMobile.wallet;
 const { walletBalance, newAddress, getTransactions, sendCoins } =
     lndMobile.onchain;
 
 export default class EmbeddedLND extends LND {
+    openChannelListener: any;
+
     getTransactions = async () => await getTransactions();
     getChannels = async () => await listChannels();
     getPendingChannels = async () => await pendingChannels();
     getClosedChannels = async () => await closedChannels();
     getChannelInfo = async (chanId: string) => await getChanInfo(chanId);
-    getBlockchainBalance = async () => await walletBalance();
+    getBlockchainBalance = async (data: any) => await walletBalance(data);
     getLightningBalance = async () => await channelBalance();
     sendCoins = async (data: any) =>
         await sendCoins(
@@ -69,9 +82,10 @@ export default class EmbeddedLND extends LND {
             preimage: data.preimage
         });
     getPayments = async () => await listPayments();
-    getNewAddress = async (data: any) => await newAddress(data.type);
-    openChannel = async (data: OpenChannelRequest) =>
-        await openChannel(
+    getNewAddress = async (data: any) =>
+        await newAddress(data.type, data.account);
+    openChannelSync = async (data: OpenChannelRequest) =>
+        await openChannelSync(
             data.node_pubkey_string,
             Number(data.local_funding_amount),
             data.privateChannel || false,
@@ -83,6 +97,45 @@ export default class EmbeddedLND extends LND {
             data.fundMax,
             data.utxos
         );
+    openChannelStream = async (data: OpenChannelRequest) => {
+        return await new Promise((resolve, reject) => {
+            LndMobileEventEmitter.addListener('OpenChannel', (e: any) => {
+                try {
+                    const error = checkLndStreamErrorResponse('OpenChannel', e);
+                    if (error === 'EOF') {
+                        return;
+                    } else if (error) {
+                        console.error('Got error from OpenChannel', [error]);
+                        reject(error);
+                        return;
+                    }
+
+                    const result = decodeOpenStatusUpdate(e.data);
+                    if (result?.psbt_fund) {
+                        resolve({ result });
+                    }
+                } catch (error) {
+                    console.error(error);
+                }
+            });
+
+            openChannel(
+                data.node_pubkey_string,
+                Number(data.local_funding_amount),
+                data.privateChannel || false,
+                data.sat_per_vbyte && !data.funding_shim
+                    ? Number(data.sat_per_vbyte)
+                    : undefined,
+                data.scidAlias,
+                data.min_confs,
+                data.spend_unconfirmed,
+                data.simpleTaprootChannel,
+                data.fundMax,
+                data.utxos,
+                data.funding_shim
+            );
+        });
+    };
     connectPeer = async (data: any) =>
         await connectPeer(data.addr.pubkey, data.addr.host, data.perm);
     decodePaymentRequest = async (urlParams?: string[]) =>
@@ -129,8 +182,16 @@ export default class EmbeddedLND extends LND {
         const force = urlParams && urlParams[2] ? true : false;
         const sat_per_vbyte =
             urlParams && urlParams[3] ? Number(urlParams[3]) : undefined;
+        const delivery_address =
+            urlParams && urlParams[4] ? urlParams[4] : undefined;
 
-        await closeChannel(fundingTxId, outputIndex, force, sat_per_vbyte);
+        return await closeChannel(
+            fundingTxId,
+            outputIndex,
+            force,
+            sat_per_vbyte,
+            delivery_address
+        );
     };
 
     getNodeInfo = async (urlParams?: Array<string>) =>
@@ -152,30 +213,46 @@ export default class EmbeddedLND extends LND {
         urlParams && (await queryRoutes(urlParams[0], urlParams[1]));
     // getForwardingHistory = () => N/A
     // // Coin Control
-    fundPsbt = async (data: any) =>
-        await fundPsbt({
-            raw: data.raw,
-            spend_unconfirmed: data.spend_unconfirmed,
-            sat_per_vbyte: data.sat_per_vbyte
-        });
-    finalizePsbt = async (data: any) =>
-        await finalizePsbt({
-            funded_psbt: data.funded_psbt
-        });
-    publishTransaction = async (data: any) =>
-        await publishTransaction({
-            tx_hex: data.tx_hex
-        });
+    fundPsbt = async (data: any) => await fundPsbt(data);
+    signPsbt = async (data: any) => await signPsbt(data);
+    finalizePsbt = async (data: any) => await finalizePsbt(data);
+    publishTransaction = async (data: any) => {
+        if (data.tx_hex) data.tx_hex = Base64Utils.hexToBase64(data.tx_hex);
+        return await publishTransaction(data);
+    };
+    fundingStateStep = async (data: any) => {
+        // Verify
+        if (
+            data.psbt_finalize?.funded_psbt &&
+            Base64Utils.isHex(data.psbt_finalize?.funded_psbt)
+        )
+            data.psbt_finalize.funded_psbt = Base64Utils.hexToBase64(
+                data.psbt_finalize.funded_psbt
+            );
+        // Finalize
+        if (
+            data.psbt_finalize?.final_raw_tx &&
+            Base64Utils.isHex(data.psbt_finalize?.final_raw_tx)
+        )
+            data.psbt_finalize.final_raw_tx = Base64Utils.hexToBase64(
+                data.psbt_finalize.final_raw_tx
+            );
+        if (
+            data.psbt_finalize?.signed_psbt &&
+            Base64Utils.isHex(data.psbt_finalize?.signed_psbt)
+        )
+            data.psbt_finalize.signed_psbt = Base64Utils.hexToBase64(
+                data.psbt_finalize.signed_psbt
+            );
+        return await fundingStateStep(data);
+    };
 
-    getUTXOs = async () => await listUnspent();
+    getUTXOs = async (data: any) => await listUnspent(data);
     bumpFee = async (data: any) => await bumpFee(data);
     lookupInvoice = async (data: any) => await lookupInvoice(data.r_hash);
 
-    // TODO inject
-    // listAccounts = () => this.getRequest('/v2/wallet/accounts');
-    // TODO inject
-    // importAccount = (data: any) =>
-    //     this.postRequest('/v2/wallet/accounts/import', data);
+    listAccounts = async () => await listAccounts();
+    importAccount = async (data: any) => await importAccount(data);
 
     // TODO rewrite subscription logic, starting on Receive view
     // subscribeInvoice = (r_hash: string) =>
@@ -197,9 +274,7 @@ export default class EmbeddedLND extends LND {
     supportsCoinControl = () => this.supports('v0.12.0');
     supportsChannelCoinControl = () => this.supports('v0.17.0');
     supportsHopPicking = () => this.supports('v0.11.0');
-    // TODO wire up accounts
-    // supportsAccounts = () => this.supports('v0.13.0');
-    supportsAccounts = () => false;
+    supportsAccounts = () => true;
     supportsRouting = () => false;
     supportsNodeInfo = () => true;
     singleFeesEarnedTotal = () => false;
@@ -211,5 +286,7 @@ export default class EmbeddedLND extends LND {
     supportsSimpleTaprootChannels = () => this.supports('v0.17.0');
     supportsCustomPreimages = () => true;
     supportsSweep = () => true;
+    supportsOnchainBatching = () => true;
+    supportsChannelBatching = () => true;
     isLNDBased = () => true;
 }