Merge branch 'FSM' of https://github.com/jl777/komodo

2019-01-10 02:25:59 +08:00
parent 9646dd709a e755fa0e7b
commit a543b675f6
27 changed files with 226 additions and 801 deletions
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -444,8 +444,8 @@ static const CRPCCommand vRPCCommands[] =
    // Pegs
    { "pegs",       "pegsaddress",   &pegsaddress,      true },

-    // Triggers
-    { "triggers",       "triggersaddress",   &triggersaddress,      true },
+    // Marmara
+    { "marmara",       "Marmaraaddress",   &marmaraaddress,      true },

    // Payments
    { "payments",       "paymentsaddress",   &paymentsaddress,      true },