Merge remote-tracking branch 'jl777/FSM' into duke

Conflicts: README.md
2019-05-28 08:05:15 -07:00
parent 14e08572d5 eb20b33718
commit 4579c5e39d
40 changed files with 1262 additions and 717 deletions
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -473,7 +473,7 @@ static const CRPCCommand vRPCCommands[] =
    { "prices",       "pricesrekt",         &pricesrekt,         true },
    { "prices",       "pricesaddfunding",         &pricesaddfunding,         true },
    { "prices",       "pricesgetorderbook",         &pricesgetorderbook,         true },
-
+    { "prices",       "pricesrefillfund",         &pricesrefillfund,         true },

    // Pegs
    { "pegs",       "pegsaddress",   &pegsaddress,      true },