Enhance EarningsTracker with time buckets and primary volume

Bitcoin/Tx.cpp

@@ -88,9 +88,9 @@ Tx::Tx(std::string const& s) {
 	auto is = std::istringstream(std::move(str));
 	is >> *this;
 	if (!is.good())
-		throw std::invalid_argument("Bitcoin::Tx: invalid hex string input.");
+		throw Util::BacktraceException<std::invalid_argument>("Bitcoin::Tx: invalid hex string input.");
 	if (is.get() != std::char_traits<char>::eof())
-		throw std::invalid_argument("Bitcoin::Tx: input string too long.");
+		throw Util::BacktraceException<std::invalid_argument>("Bitcoin::Tx: input string too long.");
 }
 
 Bitcoin::TxId Tx::get_txid() const {

Bitcoin/addr_to_scriptPubKey.hpp

@@ -1,17 +1,18 @@
 #ifndef BITCOIN_ADDR_TO_SCRIPTPUBKEY_HPP
 #define BITCOIN_ADDR_TO_SCRIPTPUBKEY_HPP
 
+#include"Util/BacktraceException.hpp"
 #include<cstdint>
 #include<string>
 #include<stdexcept>
 #include<vector>
 
 namespace Bitcoin {
 
-struct UnknownAddrType : public std::invalid_argument {
+struct UnknownAddrType : public Util::BacktraceException<std::invalid_argument> {
 public:
 	UnknownAddrType()
-		: std::invalid_argument("Bitcoin::UnknownAddrType") { }
+		: Util::BacktraceException<std::invalid_argument>("Bitcoin::UnknownAddrType") { }
 };
 
 /** Bitcoin::addr_to_scriptPubKey

Bitcoin/sighash.hpp

@@ -19,10 +19,10 @@ enum SighashFlags
 , SIGHASH_ANYONECANPAY = 0x80
 };
 
-struct InvalidSighash : public std::invalid_argument {
+struct InvalidSighash : public Util::BacktraceException<std::invalid_argument> {
 	InvalidSighash() =delete;
 	InvalidSighash(std::string const& msg)
-		: std::invalid_argument(
+		: Util::BacktraceException<std::invalid_argument>(
 			std::string("Bitcoin::InvalidSighash: ") + msg
 		  ) { }
 };

Boltz/ConnectionIF.hpp

@@ -1,6 +1,7 @@
 #ifndef BOLTZ_CONNECTIONIF_HPP
 #define BOLTZ_CONNECTIONIF_HPP
 
+#include"Util/BacktraceException.hpp"
 #include<memory>
 #include<stdexcept>
 #include<string>
@@ -35,10 +36,10 @@ class ConnectionIF {
  * @brief thrown when communications with
  * the BOLTZ server has problems.
  */
-class ApiError : public std::runtime_error {
+class ApiError : public Util::BacktraceException<std::runtime_error> {
 public:
 	ApiError(std::string const& e
-		) : std::runtime_error(e) { }
+		) : Util::BacktraceException<std::runtime_error>(e) { }
 };
 
 }

Boss/Mod/ChannelCreateDestroyMonitor.cpp

@@ -149,12 +149,13 @@ void ChannelCreateDestroyMonitor::start() {
 		try {
 			auto payload = params["channel_opened"];
 			n = Ln::NodeId(std::string(payload["id"]));
-		} catch (std::runtime_error const&) {
+		} catch (std::runtime_error const& err) {
 			return Boss::log( bus, Error
 					, "ChannelCreateDestroyMonitor: "
 					  "Unexpected channel_opened "
-					  "payload: %s"
+					  "payload: %s: %s"
 					, Util::stringify(params).c_str()
+					, err.what()
 					);
 		}
 		/* Is it already in channeled?  */
@@ -174,12 +175,13 @@ void ChannelCreateDestroyMonitor::start() {
 			n = Ln::NodeId(std::string(payload["peer_id"]));
 			old_state = std::string(payload["old_state"]);
 			new_state = std::string(payload["new_state"]);
-		} catch (std::runtime_error const&) {
+		} catch (std::runtime_error const& err) {
 			return Boss::log( bus, Error
 					, "ChannelCreateDestroyMonitor: "
 					  "Unexpected channel_state_changed "
-					  "payload: %s"
+					  "payload: %s: %s"
 					, Util::stringify(params).c_str()
+					, err.what()
 					);
 		}
 		/* Only continue if we are leaving the CHANNELD_NORMAL

Boss/Mod/ChannelCreator/Carpenter.cpp

@@ -157,14 +157,15 @@ Carpenter::construct(std::map<Ln::NodeId, Ln::Amount> plan) {
 					report << ", ";
 				report << node;
 			}
-		} catch (std::invalid_argument const&) {
+		} catch (std::invalid_argument const& ex) {
 			auto os = std::ostringstream();
 			os << res;
 			return Boss::log( bus, Error
 					, "ChannelCreator::Carpenter: "
 					  "Unexpected result from "
-					  "multifundchannel: %s"
+					  "multifundchannel: %s: %s"
 					, os.str().c_str()
+					, ex.what()
 					);
 		}
 

Boss/Mod/ChannelFinderByEarnedFee.cpp

@@ -131,12 +131,13 @@ class ChannelFinderByEarnedFee::Impl {
 						continue;
 					props.emplace(std::move(dest));
 				}
-			} catch (std::exception const&) {
+			} catch (std::exception const& ex) {
 				return Boss::log( bus, Error
 						, "ChannelFinderByEarnedFees: "
 						  "Unexpected result from "
-						  "`listchannels`: %s"
+						  "`listchannels`: %s: %s"
 						, Util::stringify(res).c_str()
+						, ex.what()
 						);
 			}
 			res = Jsmn::Object();

Boss/Mod/ChannelFinderByListpays.cpp

@@ -159,12 +159,13 @@ Ev::Io<void> ChannelFinderByListpays::extract_payees_loop() {
 				++pit->second;
 			++count;
 			return extract_payees_loop();
-		} catch (std::exception const&) {
+		} catch (std::exception const& ex) {
 			return Boss::log( bus, Error
 					, "ChannelFinderByListpays: "
 					  "Unexpected result from `listpays` "
-					  "`pays` field: %s"
+					  "`pays` field: %s: %s"
 					, Util::stringify(pay).c_str()
+					, ex.what()
 					);
 		}
 	});