Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

src/amqp/amqpabstractnotifier.h

@@ -0,0 +1,43 @@
+// Copyright (c) 2017 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef ZCASH_AMQP_AMQPABSTRACTNOTIFIER_H
+#define ZCASH_AMQP_AMQPABSTRACTNOTIFIER_H
+
+#include "amqpconfig.h"
+
+class CBlockIndex;
+class AMQPAbstractNotifier;
+
+typedef AMQPAbstractNotifier* (*AMQPNotifierFactory)();
+
+class AMQPAbstractNotifier
+{
+public:
+    AMQPAbstractNotifier() { }
+    virtual ~AMQPAbstractNotifier();
+
+    template <typename T>
+    static AMQPAbstractNotifier* Create()
+    {
+        return new T();
+    }
+
+    std::string GetType() const { return type; }
+    void SetType(const std::string &t) { type = t; }
+    std::string GetAddress() const { return address; }
+    void SetAddress(const std::string &a) { address = a; }
+
+    virtual bool Initialize() = 0;
+    virtual void Shutdown() = 0;
+
+    virtual bool NotifyBlock(const CBlockIndex *pindex);
+    virtual bool NotifyTransaction(const CTransaction &transaction);
+
+protected:
+    std::string type;
+    std::string address;
+};
+
+#endif // ZCASH_AMQP_AMQPABSTRACTNOTIFIER_H