Restore ForwardFeeMonitor's ability to see forwarding fees

Boss/Mod/EarningsTracker.cpp

@@ -235,18 +235,41 @@ class EarningsTracker::Impl {
 			     ;
 			)QRY").execute();
 
+			uint64_t total_in_earnings = 0;
+			uint64_t total_in_expenditures = 0;
+			uint64_t total_out_earnings = 0;
+			uint64_t total_out_expenditures = 0;
+
 			auto out = Json::Out();
 			auto obj = out.start_object();
 			for (auto& r : fetch) {
+				auto in_earnings = r.get<std::uint64_t>(1);
+				auto in_expenditures = r.get<std::uint64_t>(2);
+				auto out_earnings = r.get<std::uint64_t>(3);
+				auto out_expenditures = r.get<std::uint64_t>(4);
 				auto sub = obj.start_object(r.get<std::string>(0));
 				sub
-					.field("in_earnings", r.get<std::uint64_t>(1))
-					.field("in_expenditures", r.get<std::uint64_t>(2))
-					.field("out_earnings", r.get<std::uint64_t>(3))
-					.field("out_expenditures", r.get<std::uint64_t>(4))
+					.field("in_earnings", in_earnings)
+					.field("in_expenditures", in_expenditures)
+					.field("out_earnings", out_earnings)
+					.field("out_expenditures", out_expenditures)
 					;
 				sub.end_object();
+				total_in_earnings += in_earnings;
+				total_in_expenditures += in_expenditures;
+				total_out_earnings += out_earnings;
+				total_out_expenditures += out_expenditures;
 			}
+
+			auto sub = obj.start_object("total");
+			sub
+				.field("in_earnings", total_in_earnings)
+				.field("in_expenditures", total_in_expenditures)
+				.field("out_earnings", total_out_earnings)
+				.field("out_expenditures", total_out_expenditures)
+				;
+			sub.end_object();
+
 			obj.end_object();
 
 			tx.commit();

Boss/Mod/ForwardFeeMonitor.cpp

@@ -29,7 +29,7 @@ void ForwardFeeMonitor::start() {
 		try {
 			auto payload = n.params["forward_event"];
 			if ( !payload.has("out_channel")
-			  || !payload.has("fee")
+			  || !payload.has("fee_msat")
 			  || !payload.has("resolved_time")
 			  || !payload.has("received_time")
 			   )

docs/earnings_tracker.md

@@ -0,0 +1,21 @@
+# CLBOSS Earnings Tracker
+
+```mermaid
+   %%{init: {"flowchart": {"defaultRenderer": "elk"}} }%%
+
+   flowchart TB
+
+   style EarningsTracker fill:#9fb,stroke:#333,stroke-width:4px
+   Initiator-->|DbResource|EarningsTracker
+   ForwardFeeMonitor-->|ForwardFee|EarningsTracker
+   EarningsRebalancer-->|RequestMoveFunds|EarningsTracker
+   FundsMover_Runner-->|ResponseMoveFunds|EarningsTracker
+   EarningsRebalancer-->|RequestEarningsInfo|EarningsTracker
+   InitialRebalancer-->|RequestEarningsInfo|EarningsTracker
+   JitRebalancer-->|RequestEarningsInfo|EarningsTracker
+   StatusCommand-->|SolicitStatus|EarningsTracker
+   EarningsTracker-->|ResponseEarningsInfo|EarningsRebalancer
+   EarningsTracker-->|ResponseEarningsInfo|InitialRebalancer
+   EarningsTracker-->|ResponseEarningsInfo|JitRebalancer
+   EarningsTracker-->|ProvideStatus|StatusCommand
+```

tests/boss/test_forwardfeemonitor.cpp

@@ -131,7 +131,6 @@ int main() {
     "in_msat": "100001001msat",
     "out_msatoshi": 100000000,
     "out_msat": "100000000msat",
-    "fee": 1001,
     "fee_msat": "1001msat",
     "status": "settled",
     "received_time": 1560696342.368,