millisat precision

electrum/commands.py

@@ -1380,7 +1380,7 @@ async def add_request(self, amount, memo='', expiry=3600, lightning=False, force
         else:
             addr = None
         expiry = int(expiry) if expiry else None
-        key = wallet.create_request(amount, memo, expiry, addr)
+        key = wallet.create_request(amount_sat=amount, message=memo, exp_delay=expiry, address=addr)
         req = wallet.get_request(key)
         return wallet.export_request(req)
 

electrum/gui/qml/components/InvoiceDialog.qml

@@ -237,8 +237,8 @@ ElDialog {
                                 }
                                 Connections {
                                     target: invoice.amountOverride
-                                    function onSatsIntChanged() {
-                                        console.log('amountOverride satsIntChanged, sats=' + invoice.amountOverride.satsInt)
+                                    function onValueChanged() {
+                                        console.log('amountOverride valueChanged, sats=' + invoice.amountOverride.satsInt)
                                         if (amountMax.checked)  // amountOverride updated by max amount estimate
                                             amountBtc.text = Config.formatSatsForEditing(invoice.amountOverride.satsInt)
                                     }

electrum/gui/qml/components/LnurlPayRequestDialog.qml

@@ -19,8 +19,8 @@ ElDialog {
     needsSystemBarPadding: false
 
     property bool commentValid: comment.text.length <= invoiceParser.lnurlData['comment_allowed']
-    property bool amountValid: amountBtc.textAsSats.satsInt >= parseInt(invoiceParser.lnurlData['min_sendable_sat'])
-        && amountBtc.textAsSats.satsInt <= parseInt(invoiceParser.lnurlData['max_sendable_sat'])
+    property bool amountValid: amountBtc.textAsSats.msatsInt >= parseInt(invoiceParser.lnurlData['min_sendable_msat'])
+        && amountBtc.textAsSats.msatsInt <= parseInt(invoiceParser.lnurlData['max_sendable_msat'])
     property bool valid: commentValid && amountValid
 
     ColumnLayout {
@@ -41,9 +41,11 @@ ElDialog {
                 Layout.columnSpan: 2
                 Layout.fillWidth: true
                 compact: true
-                visible: invoiceParser.lnurlData['min_sendable_sat'] != invoiceParser.lnurlData['max_sendable_sat']
-                text: qsTr('Amount must be between %1 and %2 %3').arg(Config.formatSats(invoiceParser.lnurlData['min_sendable_sat'])).arg(Config.formatSats(invoiceParser.lnurlData['max_sendable_sat'])).arg(Config.baseUnit)
-                backgroundColor: constants.darkerDialogBackground
+                visible: invoiceParser.lnurlData['min_sendable_msat'] != invoiceParser.lnurlData['max_sendable_msat']
+                text: qsTr('Amount must be between %1 and %2 %3')
+                    .arg(Config.formatMilliSats(invoiceParser.lnurlData['min_sendable_msat']))
+                    .arg(Config.formatMilliSats(invoiceParser.lnurlData['max_sendable_msat']))
+                    .arg(Config.baseUnit)
             }
 
             Label {
@@ -74,10 +76,11 @@ ElDialog {
                 BtcField {
                     id: amountBtc
                     Layout.preferredWidth: rootLayout.width /3
-                    text: Config.formatSatsForEditing(invoiceParser.lnurlData['min_sendable_sat'])
-                    enabled: invoiceParser.lnurlData['min_sendable_sat'] != invoiceParser.lnurlData['max_sendable_sat']
+                    text: Config.formatMilliSatsForEditing(invoiceParser.lnurlData['min_sendable_msat'])
+                    enabled: invoiceParser.lnurlData['min_sendable_msat'] != invoiceParser.lnurlData['max_sendable_msat']
                     color: Material.foreground // override gray-out on disabled
                     fiatfield: amountFiat
+                    msatPrecision: true
                     onTextAsSatsChanged: {
                         invoiceParser.amountOverride = textAsSats
                     }

electrum/gui/qml/components/LnurlWithdrawRequestDialog.qml

@@ -20,20 +20,20 @@ ElDialog {
     needsSystemBarPadding: false
 
     property int walletCanReceive: 0
-    property int providerMinWithdrawable: parseInt(requestDetails.lnurlData['min_withdrawable_sat'])
-    property int providerMaxWithdrawable: parseInt(requestDetails.lnurlData['max_withdrawable_sat'])
+    property int providerMinWithdrawable: parseInt(requestDetails.lnurlData['min_withdrawable_msat'])
+    property int providerMaxWithdrawable: parseInt(requestDetails.lnurlData['max_withdrawable_msat'])
     property int effectiveMinWithdrawable: Math.max(providerMinWithdrawable, 1)
     property int effectiveMaxWithdrawable: Math.min(providerMaxWithdrawable, walletCanReceive)
     property bool insufficientLiquidity: effectiveMinWithdrawable > walletCanReceive
     property bool liquidityWarning: providerMaxWithdrawable > walletCanReceive
 
     property bool amountValid: !dialog.insufficientLiquidity &&
-        amountBtc.textAsSats.satsInt >= dialog.effectiveMinWithdrawable &&
-        amountBtc.textAsSats.satsInt <= dialog.effectiveMaxWithdrawable
+        amountBtc.textAsSats.msatsInt >= dialog.effectiveMinWithdrawable &&
+        amountBtc.textAsSats.msatsInt <= dialog.effectiveMaxWithdrawable
     property bool valid: amountValid
 
     Component.onCompleted: {
-        dialog.walletCanReceive = wallet.lightningCanReceive.satsInt
+        dialog.walletCanReceive = wallet.lightningCanReceive.msatsInt
     }
 
     Connections {
@@ -43,7 +43,7 @@ ElDialog {
             if (!requestDetails.busy) {
                 // don't assign while busy to prevent the view from changing while receiving
                 // the incoming payment
-                dialog.walletCanReceive = wallet.lightningCanReceive.satsInt
+                dialog.walletCanReceive = wallet.lightningCanReceive.msatsInt
             }
         }
     }
@@ -69,10 +69,10 @@ ElDialog {
                 text: qsTr('Too little incoming liquidity to satisfy this withdrawal request.')
                           + '\n\n'
                           + qsTr('Can receive: %1')
-                            .arg(Config.formatSats(dialog.walletCanReceive) + ' ' + Config.baseUnit)
+                            .arg(Config.formatMilliSats(dialog.walletCanReceive) + ' ' + Config.baseUnit)
                           + '\n'
                           + qsTr('Minimum withdrawal amount: %1')
-                            .arg(Config.formatSats(dialog.providerMinWithdrawable) + ' ' + Config.baseUnit)
+                            .arg(Config.formatMilliSats(dialog.providerMinWithdrawable) + ' ' + Config.baseUnit)
                           + '\n\n'
                           + qsTr('Do a submarine swap in the \'Channels\' tab to get more incoming liquidity.')
                 iconStyle: InfoTextArea.IconStyle.Error
@@ -85,8 +85,8 @@ ElDialog {
                 compact: true
                 visible: !dialog.insufficientLiquidity && dialog.providerMinWithdrawable != dialog.providerMaxWithdrawable
                 text: qsTr('Amount must be between %1 and %2 %3')
-                        .arg(Config.formatSats(dialog.effectiveMinWithdrawable))
-                        .arg(Config.formatSats(dialog.effectiveMaxWithdrawable))
+                        .arg(Config.formatMilliSats(dialog.effectiveMinWithdrawable))
+                        .arg(Config.formatMilliSats(dialog.effectiveMaxWithdrawable))
                         .arg(Config.baseUnit)
                 backgroundColor: constants.darkerDialogBackground
             }
@@ -97,8 +97,8 @@ ElDialog {
                 compact: true
                 visible: dialog.liquidityWarning && !dialog.insufficientLiquidity
                 text: qsTr('The maximum withdrawable amount (%1) is larger than what your channels can receive (%2).')
-                            .arg(Config.formatSats(dialog.providerMaxWithdrawable) + ' ' + Config.baseUnit)
-                            .arg(Config.formatSats(dialog.walletCanReceive) + ' ' + Config.baseUnit)
+                            .arg(Config.formatMilliSats(dialog.providerMaxWithdrawable) + ' ' + Config.baseUnit)
+                            .arg(Config.formatMilliSats(dialog.walletCanReceive) + ' ' + Config.baseUnit)
                         + ' '
                         + qsTr('You may need to do a submarine swap to increase your incoming liquidity.')
                 iconStyle: InfoTextArea.IconStyle.Warn
@@ -135,10 +135,11 @@ ElDialog {
                 BtcField {
                     id: amountBtc
                     Layout.preferredWidth: rootLayout.width / 3
-                    text: Config.formatSatsForEditing(dialog.effectiveMaxWithdrawable)
+                    text: Config.formatMilliSatsForEditing(dialog.effectiveMaxWithdrawable)
                     enabled: !dialog.insufficientLiquidity && (dialog.providerMinWithdrawable != dialog.providerMaxWithdrawable)
                     color: Material.foreground // override gray-out on disabled
                     fiatfield: amountFiat
+                    msatPrecision: true
                 }
                 Label {
                     text: Config.baseUnit
@@ -173,8 +174,8 @@ ElDialog {
                 icon.source: '../../icons/confirmed.png'
                 enabled: valid && !requestDetails.busy
                 onClicked: {
-                    var satsAmount = amountBtc.textAsSats.satsInt;
-                    requestDetails.lnurlRequestWithdrawal(satsAmount);
+                    var msatsAmount = amountBtc.textAsSats.msatsInt;
+                    requestDetails.lnurlRequestWithdrawal(msatsAmount);
                     dialog.close();
                 }
             }

electrum/gui/qml/components/OpenChannelDialog.qml

@@ -177,7 +177,7 @@ ElDialog {
 
                     Connections {
                         target: channelopener.amount
-                        function onSatsIntChanged() {
+                        function onValueChanged() {
                             if (is_max.checked)  // amount updated by max amount estimate
                                 amountBtc.text = Config.formatSatsForEditing(channelopener.amount.satsInt)
                         }

electrum/gui/qml/components/ReceiveDetailsDialog.qml

@@ -58,6 +58,7 @@ ElDialog {
                 id: amountBtc
                 fiatfield: amountFiat
                 Layout.fillWidth: true
+                msatPrecision: true
             }
 
             Label {
@@ -103,22 +104,23 @@ ElDialog {
                 Layout.preferredWidth: 1
                 text: qsTr('Onchain')
                 icon.source: '../../icons/bitcoin.png'
+                enabled: !amountBtc.textAsSats.hasMsatPrecision
                 onClicked: { dialog.isLightning = false; doAccept() }
             }
             FlatButton {
                 Layout.fillWidth: true
                 Layout.preferredWidth: 1
-                enabled: Daemon.currentWallet.isLightning && (Daemon.currentWallet.lightningCanReceive.satsInt
-                            > amountBtc.textAsSats.satsInt || Daemon.currentWallet.canGetZeroconfChannel)
+                enabled: Daemon.currentWallet.isLightning && (Daemon.currentWallet.lightningCanReceive.msatsInt
+                            > amountBtc.textAsSats.msatsInt || Daemon.currentWallet.canGetZeroconfChannel)
                 text: qsTr('Lightning')
                 icon.source: '../../icons/lightning.png'
                 onClicked: {
-                    if (Daemon.currentWallet.lightningCanReceive.satsInt > amountBtc.textAsSats.satsInt) {
+                    if (Daemon.currentWallet.lightningCanReceive.msatsInt > amountBtc.textAsSats.msatsInt) {
                         // can receive on existing channel
                         dialog.isLightning = true
                         doAccept()
-                    } else if (Daemon.currentWallet.canGetZeroconfChannel && amountBtc.textAsSats.satsInt
-                                >= Daemon.currentWallet.minChannelFunding.satsInt) {
+                    } else if (Daemon.currentWallet.canGetZeroconfChannel && amountBtc.textAsSats.msatsInt
+                                >= Daemon.currentWallet.minChannelFunding.msatsInt) {
                         // ask for confirmation of zeroconf channel to prevent fee surprise
                         var confirmdialog = app.messageDialog.createObject(dialog, {
                             title: qsTr('Confirm just-in-time channel'),

electrum/gui/qml/components/controls/BtcField.qml

@@ -27,7 +27,7 @@ TextField {
     Connections {
         target: Config
         function onBaseUnitChanged() {
-            amount.text = amount.textAsSats.satsInt != 0
+            amount.text = amount.textAsSats.msatsInt != 0
                 ? Config.satsToUnits(amount.textAsSats)
                 : ''
         }

electrum/gui/qml/components/controls/ChannelBar.qml

@@ -22,7 +22,7 @@ Item {
     }
 
     function do_update() {
-        var cap = capacity.satsInt * 1000
+        var cap = capacity.msatsInt
         var twocap = cap * 2
         l1.width = width * (cap - localCapacity.msatsInt) / twocap
         if (frozenForSending) {
@@ -48,22 +48,22 @@ Item {
 
     Connections {
         target: localCapacity
-        function onMsatsIntChanged() { update() }
+        function onValueChanged() { update() }
     }
 
     Connections {
         target: remoteCapacity
-        function onMsatsIntChanged() { update() }
+        function onValueChanged() { update() }
     }
 
     Connections {
         target: canSend
-        function onMsatsIntChanged() { update() }
+        function onValueChanged() { update() }
     }
 
     Connections {
         target: canReceive
-        function onMsatsIntChanged() { update() }
+        function onValueChanged() { update() }
     }
 
     Rectangle {

electrum/gui/qml/components/controls/FormattedAmount.qml

@@ -26,7 +26,7 @@ GridLayout {
     }
     Label {
         visible: valid
-        text: amount.msatsInt != 0 ? Config.formatMilliSats(amount) : Config.formatSats(amount)
+        text: Config.formatMilliSats(amount)
         font.family: FixedFont
     }
     Label {

electrum/gui/qml/components/controls/HistoryItemDelegate.qml

@@ -106,10 +106,10 @@ Item {
                     font.pixelSize: constants.fontSizeMedium
                     Layout.alignment: Qt.AlignRight
                     font.bold: true
-                    color: model.value.satsInt >= 0 ? constants.colorCredit : constants.colorDebit
+                    color: model.value.msatsInt >= 0 ? constants.colorCredit : constants.colorDebit
 
                     function updateText() {
-                        text = Config.formatSats(model.value)
+                        text = Config.formatMilliSats(model.value)
                     }
                     Component.onCompleted: updateText()
                 }

electrum/gui/qml/components/controls/InvoiceDelegate.qml

@@ -77,7 +77,7 @@ ItemDelegate {
                     ? ''
                     : model.amount.isMax
                         ? 'MAX'
-                        : Config.formatSats(model.amount)
+                        : Config.formatMilliSats(model.amount)
                 font.pixelSize: constants.fontSizeMedium
                 font.family: FixedFont
             }
@@ -142,10 +142,10 @@ ItemDelegate {
     Connections {
         target: Config
         function onBaseUnitChanged() {
-            amount.text = model.amount.isEmpty ? '' : Config.formatSats(model.amount)
+            amount.text = model.amount.isEmpty ? '' : Config.formatMilliSats(model.amount)
         }
         function onThousandsSeparatorChanged() {
-            amount.text = model.amount.isEmpty ? '' : Config.formatSats(model.amount)
+            amount.text = model.amount.isEmpty ? '' : Config.formatMilliSats(model.amount)
         }
     }
     Connections {

electrum/gui/qml/qeconfig.py

@@ -1,6 +1,6 @@
 import copy
 from decimal import Decimal
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
 from PyQt6.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, QRegularExpression
 
@@ -360,6 +360,21 @@ def formatSatsForEditing(self, satoshis):
             add_thousands_sep=False,
         )
 
+    @pyqtSlot('qint64', result=str)
+    @pyqtSlot(QEAmount, result=str)
+    def formatMilliSatsForEditing(self, msatoshis):
+        if isinstance(msatoshis, QEAmount):
+            satoshis = Decimal(msatoshis.msatsInt) / 1000
+        elif isinstance(msatoshis, int):
+            satoshis = Decimal(msatoshis) / 1000
+
+        precision = 3  # config.amt_precision_post_satoshi is not exposed in preferences
+        return self.config.format_amount(
+            satoshis,
+            add_thousands_sep=False,
+            precision=precision,
+        )
+
     @pyqtSlot('qint64', result=str)
     @pyqtSlot('qint64', bool, result=str)
     @pyqtSlot(QEAmount, result=str)
@@ -372,16 +387,23 @@ def formatSats(self, satoshis, with_unit=False):
         else:
             return self.config.format_amount(satoshis)
 
+    @pyqtSlot('qint64', result=str)
+    @pyqtSlot('qint64', bool, result=str)
     @pyqtSlot(QEAmount, result=str)
     @pyqtSlot(QEAmount, bool, result=str)
     def formatMilliSats(self, amount, with_unit=False):
-        assert isinstance(amount, QEAmount), f"unexpected type for amount: {type(amount)}"
-        msats = amount.msatsInt
+        if isinstance(amount, QEAmount):
+            msats = amount.msatsInt
+        elif isinstance(amount, int):
+            msats = amount
+        else:
+            raise Exception(f"Unknown amount type: {str(type(amount))}")
+        sats = Decimal(msats) / 1000
         precision = 3  # config.amt_precision_post_satoshi is not exposed in preferences
         if with_unit:
-            return self.config.format_amount_and_units(msats/1000, precision=precision)
+            return self.config.format_amount_and_units(sats, precision=precision)
         else:
-            return self.config.format_amount(msats/1000, precision=precision)
+            return self.config.format_amount(sats, precision=precision)
 
     @pyqtSlot(str, result=QEAmount)
     def unitsToSats(self, unitAmount):
@@ -391,11 +413,9 @@ def unitsToSats(self, unitAmount):
         except Exception:
             return self._amount
 
-        sat_max_precision = self.config.BTC_AMOUNTS_DECIMAL_POINT
         msat_max_precision = self.config.BTC_AMOUNTS_DECIMAL_POINT + 3
-        sat_max_prec_amount = int(pow(10, sat_max_precision) * x)
         msat_max_prec_amount = int(pow(10, msat_max_precision) * x)
-        self._amount = QEAmount(amount_sat=sat_max_prec_amount, amount_msat=msat_max_prec_amount)
+        self._amount = QEAmount(amount_msat=msat_max_prec_amount)
         return self._amount
 
     @pyqtSlot('quint64', result=float)

electrum/gui/qml/qefx.py

@@ -115,7 +115,7 @@ def enabled(self, enable):
     def fiatValue(self, satoshis, plain=True):
         rate = self.fx.exchange_rate()
         if isinstance(satoshis, QEAmount):
-            satoshis = satoshis.msatsInt / 1000 if satoshis.msatsInt != 0 else satoshis.satsInt
+            satoshis = Decimal(satoshis.msatsInt) / 1000
         else:
             try:
                 sd = Decimal(satoshis)
@@ -132,7 +132,7 @@ def fiatValue(self, satoshis, plain=True):
     @pyqtSlot(QEAmount, str, bool, result=str)
     def fiatValueHistoric(self, satoshis, timestamp, plain=True):
         if isinstance(satoshis, QEAmount):
-            satoshis = satoshis.msatsInt / 1000 if satoshis.msatsInt != 0 else satoshis.satsInt
+            satoshis = Decimal(satoshis.msatsInt) / 1000
         else:
             try:
                 sd = Decimal(satoshis)