fix: support pay offer invoice and bug fixing when it is necessary

Signed-off-by: Vincenzo Palazzo <[email protected]>

Author: vincenzopalazzo

lib/src/kraken.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:collection';
 import 'dart:convert';
 import 'package:clightning_rpc/clightning_rpc.dart';
 import 'package:cln_common/cln_common.dart';
@@ -16,20 +17,25 @@ class KrakenPlugin extends Plugin {
       Plugin plugin, Map<String, Object> request) async {
     log(level: "info", message: "This is the kraken doctor output.");
     var params = DoctorRequest.fromJson(request);
+    Map<String, dynamic> response = {};
     try {
       // TODO make sure that this will trow an exception
-      Map<String, dynamic> listPays = await rpc!
-          .call(method: "paystatus", params: params.toPaysStatusRequest());
+      Map<String, dynamic>? listPays;
+      if (request.containsKey("bolt11")) {
+        listPays = await rpc!
+            .call(method: "paystatus", params: params.toPaysStatusRequest());
+        response["listpays"] = listPays;
+      }
       Map<String, dynamic> listFunds = await rpc!
           .call(method: "listfunds", params: params.toListFundsRequest());
 
-      /// Make a call to listfunds like the prev one, and take only the channels
-      /// The raw reason is the error message that core lightning return
-      return Future.value({
-        "listpays": listPays,
+      response.addAll({
         "channels": listFunds["channels"],
-        "raw_reason": request["raw_reason"] ?? "unknown"
+        "raw_reason": request["raw_reason"] ?? "unknown",
+        "raw_error_code": request["raw_error_code"] ?? "unknown",
+        "raw_data": request["raw_data"] ?? "unknown"
       });
+      return Future.value(response.cast<String, Object>());
     } on LNClientException catch (ex, stacktrace) {
       plugin.log(level: "broken", message: "error received: ${ex.message}");
       plugin.log(level: "broken", message: stacktrace.toString());
@@ -39,9 +45,13 @@ class KrakenPlugin extends Plugin {
 
   Future<String> handleBolt12(Plugin plugin,
       {required FetchInvoiceRequest offer}) async {
-    var fetchInvoice = await rpc!
-        .call<FetchInvoiceRequest, FetchInvoiceResponse>(
-            method: "fetchinvoice", params: offer);
+    var fetchInvoice = await rpc!.call<FetchInvoiceRequest,
+            FetchInvoiceResponse>(
+        method: "fetchinvoice",
+        params: offer,
+        onDecode: (json) =>
+            FetchInvoiceResponse.fromJson(json as HashMap<String, dynamic>));
+    log(level: "info", message: "fetch invoice: ${fetchInvoice.toJSON()}");
     return fetchInvoice.invoice;
   }
 
@@ -60,16 +70,22 @@ class KrakenPlugin extends Plugin {
       String invoice = request["invoice"]! as String;
       // The human-readable prefix for BOLT 12 offers is lno.
       if (invoice.startsWith("lno")) {
+        request["bolt11"] = invoice;
         // Modify request with the correct bolt 12!
         // FIXME: we should remove the msatoshi amount from the request? or the pay command
         // us smart enough to handle it?
+        var amountMsat = request["amount_msat"] == null
+            ? null
+            : int.parse(request["amount_msat"].toString());
+
         request["bolt11"] = await handleBolt12(plugin,
             offer: FetchInvoiceRequest(
-                offer: invoice, msamsatoshi: request["msatoshi"] as String?));
+                offer: invoice,
+                msatoshi: request["msatoshi"]?.toString(),
+                amountMsat: amountMsat));
       } else {
         request["bolt11"] = invoice;
       }
-      // TODO: rpc should return an exception if any error occurs, and if we have the error returned run the doctor command
       PayResponse result = await rpc!.call<PayRequest, PayResponse>(
           method: "pay",
           params: PayRequest.fromJson(request),
@@ -78,7 +94,14 @@ class KrakenPlugin extends Plugin {
       return result.toJSON() as Map<String, Object>;
     } on LNClientException catch (ex, stacktrace) {
       request["raw_reason"] = ex.message;
-      plugin.log(level: "broken", message: "error received: ${ex.message}");
+      request["raw_error_code"] = ex.code;
+      if (ex.data != null) {
+        request["raw_data"] = ex.data!;
+      }
+      plugin.log(
+          level: "broken",
+          message:
+              "error received: msg=${ex.message} code: ${ex.code} data: ${ex.data}");
       plugin.log(level: "broken", message: stacktrace.toString());
       return krakenDoctor(plugin, request);
     } catch (ex, stacktrace) {
@@ -112,7 +135,7 @@ class KrakenPlugin extends Plugin {
     var rpcName = configuration["rpc-file"]!.toString();
     rpc = RPCClient().connect("$rpcPath/$rpcName") as RPCClient;
     log(level: "info", message: "kraken payment configured");
-
+    log(level: "info", message: "Configuration payload $configuration");
     return response;
   }
 }

lib/src/model/model.dart

@@ -84,12 +84,14 @@ class PayResponse extends Serializable {
   Map<String, dynamic> toJSON() => _$PayResponseToJson(this);
 }
 
-@JsonSerializable()
+@JsonSerializable(includeIfNull: false)
 class FetchInvoiceRequest extends Serializable {
   String offer;
-  String? msamsatoshi;
+  String? msatoshi;
+  @JsonKey(name: "amount_msat")
+  int? amountMsat;
 
-  FetchInvoiceRequest({required this.offer, this.msamsatoshi});
+  FetchInvoiceRequest({required this.offer, this.msatoshi, this.amountMsat});
 
   factory FetchInvoiceRequest.fromJson(Map<String, dynamic> json) =>
       _$FetchInvoiceRequestFromJson(json);

lib/src/model/model.g.dart

@@ -8,7 +8,7 @@ environment:
 
 dependencies:
   clightning_rpc: ^0.0.2-beta.4
-  cln_common: ^0.0.1-beta.1
+  cln_common: ^0.0.1-beta.2
   cln_plugin_api: ^0.0.1-beta.2
   json_annotation: ^4.5.0