pi followup

Author: accumulator

electrum/payment_identifier.py

@@ -491,7 +491,7 @@ def parse_amount(self, x: str) -> Union[str, int]:
             x = Decimal(x) * p
             if int(x) != x:
                 raise InvalidOperation("no millisat precision allowed")
-            return int(p * Decimal(x))
+            return int(x)
         except InvalidOperation:
             raise Exception("Invalid amount")
 

tests/test_payment_identifier.py

@@ -192,8 +192,8 @@ def test_lnurl_pay_resolve(self, mock_request_lnurl):
         # Mock lnurl-p response
         mock_lnurl6_data = LNURL6Data(
             callback_url='https://example.com/lnurl-pay',
-            max_sendable_sat=1_000_000,
-            min_sendable_sat=1_000,
+            max_sendable_msat=1_000_000_000,
+            min_sendable_msat=1_000_000,
             metadata_plaintext='Test payment',
             comment_allowed=100,
         )
@@ -213,8 +213,8 @@ async def run_resolve():
         self.assertTrue(pi.need_finalize())
         self.assertIsNotNone(pi.lnurl_data)
         self.assertTrue(isinstance(pi.lnurl_data, LNURL6Data))
-        self.assertEqual(1_000, pi.lnurl_data.min_sendable_sat)
-        self.assertEqual(1_000_000, pi.lnurl_data.max_sendable_sat)
+        self.assertEqual(1_000_000, pi.lnurl_data.min_sendable_msat)
+        self.assertEqual(1_000_000_000, pi.lnurl_data.max_sendable_msat)
         self.assertEqual('Test payment', pi.lnurl_data.metadata_plaintext)
         self.assertEqual(100, pi.lnurl_data.comment_allowed)
 
@@ -230,8 +230,8 @@ def test_lnurl_withdraw_resolve(self, mock_request_lnurl):
             callback_url='https://example.com/lnurl-withdraw',
             k1='test-k1-value',
             default_description='Test withdrawal',
-            min_withdrawable_sat=1_000,
-            max_withdrawable_sat=500_000,
+            min_withdrawable_msat=1_000,
+            max_withdrawable_msat=500_000,
         )
         mock_request_lnurl.return_value = mock_lnurl3_data
 
@@ -249,8 +249,8 @@ async def run_resolve():
         self.assertIsNotNone(pi.lnurl_data)
         self.assertEqual('test-k1-value', pi.lnurl_data.k1)
         self.assertEqual('Test withdrawal', pi.lnurl_data.default_description)
-        self.assertEqual(1000, pi.lnurl_data.min_withdrawable_sat)
-        self.assertEqual(500000, pi.lnurl_data.max_withdrawable_sat)
+        self.assertEqual(1000, pi.lnurl_data.min_withdrawable_msat)
+        self.assertEqual(500000, pi.lnurl_data.max_withdrawable_msat)
 
     @patch('electrum.payment_identifier.request_lnurl')
     def test_lnurl_resolve_error(self, mock_request_lnurl):
@@ -334,6 +334,13 @@ def test_multiline(self):
         self.assertEqual(1000, pi.multiline_outputs[0].value)
         self.assertEqual(0, pi.multiline_outputs[1].value)
 
+        pi_str = '\n'.join([
+            'bc1qj3zx2zc4rpv3npzmznxhdxzn0wm7pzqp8p2293,0.01',
+            'bc1q66ex4c3vek4cdmrfjxtssmtguvs3r30pf42jpj,0.000001',  # msat precision should invalidate multiline
+        ])
+        pi = PaymentIdentifier(self.wallet, pi_str)
+        self.assertFalse(pi.is_valid())
+
     def test_spk(self):
         address = 'bc1qj3zx2zc4rpv3npzmznxhdxzn0wm7pzqp8p2293'
         for pi_str in [