fix mock invoice + lnbits invoice

.env.example

@@ -1,2 +1,3 @@
 LN_BITS_API_ENDPOINT=https://your-lnbits-node
-LN_BITS_API_KEY=ADMIN_API_KEY
+LN_BITS_API_KEY=ADMIN_API_KEY
+MOCK_LN=true

README.md

@@ -73,6 +73,16 @@ Launch your Cashubrew server with a single command:
 mix phx.server
 ```
 
+## Environnement vars for the backend
+
+Create an .env to setup your LN_BITS or Mock LN mode
+```
+LN_BITS_API_ENDPOINT=https://your-lnbits-node
+LN_BITS_API_KEY=ADMIN_API_KEY
+MOCK_LN=true
+
+``` 
+
 🌈 Voilà! Your mint is now live at `http://localhost:4000`.
 
 ## 🧙‍♂️ Wallet CLI Magic

config/dev.exs

@@ -42,3 +42,10 @@ config :cashubrew, Cashubrew.Repo,
 config :cashubrew, :repo, Cashubrew.Repo
 
 config :cashubrew, ecto_repos: [Cashubrew.Repo]
+
+# Use mock repo if MOCK_LN environment variable is set to "true"
+if System.get_env("MOCK_LN") == "true" do
+  config :cashubrew, :ln, Cashubrew.Lightning.MockLightningNetworkService
+else
+  config :cashubrew, :ln, Cashubrew.Lightning.LightningNetworkService
+end

config/prod.exs

@@ -21,3 +21,10 @@ config :cashubrew, Cashubrew.Web.Endpoint, secret_key_base: System.get_env("SECR
 
 # Do not print debug messages in production
 config :logger, level: :info
+
+# Use mock ln if MOCK_LN environment variable is set to "true"
+if System.get_env("MOCK_LN") == "true" do
+  config :cashubrew, :ln, Cashubrew.Lightning.MockLightningNetworkService
+else
+  config :cashubrew, :ln, Cashubrew.Lightning.LightningNetworkService
+end

config/test.exs

@@ -27,3 +27,10 @@ else
 
   config :cashubrew, :repo, Cashubrew.Repo
 end
+
+# Use mock LN if MOCK_LN environment variable is set to "true"
+if System.get_env("MOCK_LN") == "true" do
+  config :cashubrew, :ln, Cashubrew.Lightning.MockLightningNetworkService
+else
+  config :cashubrew, :ln, Cashubrew.Lightning.LightningNetworkService
+end

lib/cashubrew/core/mint.ex

@@ -6,9 +6,6 @@
   use GenServer
   alias Cashubrew.Cashu.BlindSignature
   alias Cashubrew.Crypto.BDHKE
-  alias Cashubrew.Lightning.LightningNetworkService
-  alias Cashubrew.Lightning.MockLightningNetworkService
-  alias Cashubrew.LNBitsApi
   alias Cashubrew.Query.MeltTokens
   alias Cashubrew.Schema.{Key, Keyset, MeltQuote, MeltTokens, MintConfiguration, MintQuote}
 
@@ -125,33 +122,43 @@
 
   def handle_call({:create_mint_quote, amount, description}, _from, state) do
     repo = Application.get_env(:cashubrew, :repo)
+    ln = Application.get_env(:cashubrew, :ln)
 
-    case LightningNetworkService.create_invoice(amount, description) do
-      {:ok, payment_request, _payment_hash} ->
+    IO.inspect(System.get_env("MOCK_LN"), label: "MOCK_LN")
+    IO.inspect(Application.get_env(:cashubrew, :ln), label: "Configured LN Module")
+    result = ln.create_invoice(amount, description)
+
+    case result do
+      {:ok, payment_request, payment_hash} ->
         # 1 hour expiry
         expiry = :os.system_time(:second) + 3600
 
         attrs = %{
           amount: amount,
           payment_request: payment_request,
           expiry: expiry,
-          description: description
-          # payment_hash: _payment_hash,
+          description: description,
+          payment_hash: payment_hash
         }
 
-        case repo.insert(MintQuote.changeset(%MintQuote{}, attrs)) do
-          {:ok, quote} ->
-            {:reply, {:ok, quote}, state}
-
-          {:error, changeset} ->
-            {:reply, {:error, changeset}, state}
-        end
+        insert_quote(repo, attrs, state)
 
       {:error, reason} ->
         {:reply, {:error, reason}, state}
     end
   end
 
+  # Helper function to insert the quote into the database
+  defp insert_quote(repo, attrs, state) do
+    case repo.insert(MintQuote.changeset(%MintQuote{}, attrs)) do
+      {:ok, quote} ->
+        {:reply, {:ok, quote}, state}
+
+      {:error, changeset} ->
+        {:reply, {:error, changeset}, state}
+    end
+  end
+
   def handle_call({:get_mint_quote, quote_id}, _from, state) do
     repo = Application.get_env(:cashubrew, :repo)
     quote = repo.get(MintQuote, quote_id)
@@ -258,10 +265,11 @@
     end
   end
 
+  # TODO
   def handle_call({:create_melt_tokens, quote_id, inputs}, _from, state) do
     repo = Application.get_env(:cashubrew, :repo)
+    IO.puts("inputs: #{inputs}")
 
-    # TODO
     # Verify quote_id
 
     {:ok, melt_find} = Cashubrew.Query.MeltTokens.get_melt_by_quote_id!(quote_id)
@@ -277,19 +285,18 @@
 
     fee_reserve = 0
     # Create and Saved melt quote
+    expiry = :os.system_time(:second) + 3600
 
     attrs = %{
       # quote_id
       request: quote_id,
       unit: quote_id,
       amount: 0,
-      fee_reserve: 0,
-      expiry: 0,
+      fee_reserve: fee_reserve,
+      expiry: expiry,
       request_lookup_id: quote_id
     }
 
-    expiry = :os.system_time(:second) + 3600
-
     case repo.insert(MeltTokens.changeset(%MeltTokens{}, attrs)) do
       {:ok, melt_quote} ->
         {:reply, {:ok, melt_quote}, state}

lib/cashubrew/lightning/lightning_network_service.ex

@@ -21,16 +21,28 @@ defmodule Cashubrew.Lightning.LightningNetworkService do
     GenServer.call(__MODULE__, {:check_payment, payment_hash})
   end
 
-  def handle_call({:create_invoice, amount, _description}, _from, state) do
-    unit_input = "sat"
+  def handle_call({:create_invoice, amount, description}, _from, state) do
+    amount =
+      case Integer.parse(amount) do
+        {int, _} -> int
+        # If parsing fails, assume it's already an integer
+        :error -> amount
+      end
 
     attributes = %{
-      out: "false",
+      # out: false means it is an incoming payment request
+      out: false,
+      # amount in satoshis
       amount: amount,
-      unit_input: unit_input
+      # description/memo for the invoice
+      memo: description
+      # unit_input: unit_input,
+      # expiry: 0,
+      # internal: false,
+      # webhook: "",
     }
 
-    case LNBitsApi.post_data("api/v1/payments", attributes) do
+    case LNBitsApi.post_data("/api/v1/payments", attributes) do
       {:ok, response_body} ->
         IO.puts("Success create in: #{response_body}")
 

lib/cashubrew/lightning/ln_bits.ex

@@ -4,9 +4,6 @@ defmodule Cashubrew.LNBitsApi do
   """
   Dotenv.load()
 
-  @api_endpoint System.get_env("LN_BITS_API_ENDPOINT")
-  @api_key System.get_env("LN_BITS_API_KEY")
-
   def fetch_data(path, attributes) do
     api_base_url = System.get_env("LN_BITS_API_ENDPOINT")
     api_key = System.get_env("LN_BITS_API_KEY")

lib/cashubrew/web/controllers/mint_controller.ex

@@ -165,9 +165,9 @@ defmodule Cashubrew.Web.MintController do
   end
 
   def create_mint_quote(conn, %{"amount" => amount, "unit" => "sat"} = params) do
-    description = Map.get(params, "description")
+    unit = Map.get(params, "unit")
 
-    case Mint.create_mint_quote(amount, description) do
+    case Mint.create_mint_quote(amount, unit) do
       {:ok, quote} ->
         conn
         |> put_status(:created)