Improve Diode CLI compatibility

Author: dominicletz

lib/network/edge_v2.ex

@@ -19,7 +19,7 @@ defmodule Network.EdgeV2 do
           inbuffer: nil | {integer(), binary()},
           last_message: Time.t(),
           last_ticket: Time.t(),
-          last_warning: Time.t(),
+          last_warning: nil | {:ticket, Time.t()},
           node_address: :inet.ip_address(),
           node_id: Wallet.t(),
           version: integer(),
@@ -593,6 +593,20 @@ defmodule Network.EdgeV2 do
 
       true ->
         dl = Ticket.server_sign(dl, Wallet.privkey!(Diode.wallet()))
+
+        # If the version is 1000 and this is the first ticket of this session
+        # we need to reset the device usage to the last ticket
+        if state.version == 1000 and state.last_ticket == nil do
+          last_ticket =
+            TicketStore.find(device_address(state), Ticket.fleet_contract(dl), Ticket.epoch(dl))
+
+          if last_ticket != nil do
+            TicketStore.reset_device_usage(device_address(state), Ticket.total_bytes(last_ticket))
+          else
+            TicketStore.reset_device_usage(device_address(state), 0)
+          end
+        end
+
         ret = TicketStore.add(dl, device_id(state), state.version)
         total = Ticket.total_bytes(dl)
         log(state, "ticket total: #{total} ret => #{inspect(ret, limit: 32)}")

lib/ticketstore.ex

@@ -37,6 +37,12 @@ defmodule TicketStore do
     :ets.update_counter(:device_usage_tracker, {device, epoch}, value, {:key, 0})
   end
 
+  def reset_device_usage(device, value) do
+    epoch = epoch()
+    key = {device, epoch}
+    :ets.insert(:device_usage_tracker, {key, value})
+  end
+
   def device_usage(device) do
     epoch = epoch()
 
@@ -47,7 +53,11 @@ defmodule TicketStore do
   end
 
   def device_paid_bytes(device, fleet) do
-    case find(device, fleet, epoch()) do
+    Enum.find_value(RemoteChain.chains(), fn chain ->
+      epoch = RemoteChain.epoch(chain)
+      find(device, fleet, epoch)
+    end)
+    |> case do
       nil -> 0
       tck -> Ticket.total_bytes(tck)
     end
@@ -200,21 +210,15 @@ defmodule TicketStore do
   @doc """
     Handling a ConnectionTicket
   """
-  def add(tck, wallet, version \\ 1000) do
+  def add(tck, wallet, _version \\ 1000) do
     chain_id = Ticket.chain_id(tck)
     tepoch = Ticket.epoch(tck)
     epoch = RemoteChain.epoch(chain_id)
     address = Wallet.address!(wallet)
     fleet = Ticket.fleet_contract(tck)
     last = find(address, fleet, tepoch)
     ticket_usage = if last == nil, do: 0, else: Ticket.total_bytes(last)
-
-    usage =
-      if version > 1_000 do
-        max(ticket_usage, device_usage(address))
-      else
-        ticket_usage
-      end
+    usage = max(ticket_usage, device_usage(address))
 
     cond do
       tepoch not in recent_epochs(chain_id) ->