Merge upstream FSM into duke

2019-10-09 22:00:02 -04:00
parent db8acab3de 141c8e76b4
commit 73dcf87f10
57 changed files with 906 additions and 635 deletions
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -386,7 +386,7 @@ public:
        READWRITE(nIndex);
    }

-    int SetMerkleBranch(const CBlock& block);
+    void SetMerkleBranch(const CBlock& block);


    /**