V0.13.0.x

.gitignore

@@ -1,3 +1,4 @@
+pay-core-team.sh
 *.sublime-project
 *.sublime-workspace
 todo.txt

configure.ac

@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
-define(_CLIENT_VERSION_MINOR, 12)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_MINOR, 13)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2015)

dash-docs/function-layout.txt

@@ -0,0 +1,22 @@
+
+Dash2T
+    -- Websockets / ZeroMQ daemon
+
+    Listens on port 10014 for websocks
+    Listens for ZeroMQ commands (relays them locally to DashD.rpcdapi)
+
+DashD
+    --
+
+    rpcdapi
+        dapi: Execute json command on behalf of a user (delivered locally from Dash2T)
+
+    CDapi
+        ValidateCommand
+        ExecuteCommand
+
+    EndUser
+        Load
+        Save
+        UpdateField
+

dash-docs/prototype-setup.txt

@@ -0,0 +1,13 @@
+Setting up the prototype (using mainnet atm):
+
+
+1. Download and install dash (https://github.com/dashpay/dash)
+2. Setup a data directory in ~/.dash-data
+3. Create your user files. For example to create the user evan, write this file to ~/.dash-data/users/evan
+file contents: {"name":"Evan Duffield","username":"evan","stars":5}
+4. Download dash-2t, the tier-2 websockets proxy
+5. Run the client with a command like this:
+dash_t2 --datadir2="/Users/evan/.dash-data" --eventnotify="/Users/evan/Desktop/dash-2t/serve/event.py --event=%s"
+6. Start dash-2t, "python app.py"
+7. Download and run the electrum client at: https://github.com/evan82/electrum-dash
+8. Start 2x versions of client with 2 different users : ./electrum-dash -w ~/.test-electrum2 --electrum_path=~/.electrum-test-2

src/Makefile.am

@@ -94,9 +94,12 @@ BITCOIN_CORE_H = \
   crypter.h \
   darksend.h \
   darksend-relay.h \
+  easywsclient.h \
   db.h \
   eccryptoverify.h \
   ecwrapper.h \
+  evo/file.h \
+  evo/dapi.h \
   hash.h \
   init.h \
   instantx.h \
@@ -178,6 +181,11 @@ libbitcoin_server_a_SOURCES = \
   bloom.cpp \
   chain.cpp \
   checkpoints.cpp \
+  easywsclient.cpp \
+  evo/file.cpp \
+  evo/dapi.cpp \
+  json/json_spirit_reader.cpp \
+  json/json_spirit_writer.cpp \
   init.cpp \
   leveldbwrapper.cpp \
   main.cpp \
@@ -188,6 +196,7 @@ libbitcoin_server_a_SOURCES = \
   pow.cpp \
   rest.cpp \
   rpcblockchain.cpp \
+  rpcdapi.cpp \
   rpcmasternode.cpp \
   rpcmasternode-budget.cpp \
   rpcmining.cpp \
@@ -207,10 +216,12 @@ libbitcoin_server_a_SOURCES = \
 libbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES)
 libbitcoin_wallet_a_SOURCES = \
   activemasternode.cpp \
-  darksend.cpp \
-  darksend-relay.cpp \
   db.cpp \
   crypter.cpp \
+  darksend.cpp \
+  darksend-relay.cpp \
+  evo/file.cpp \
+  evo/dapi.cpp \
   instantx.cpp \
   masternode.cpp \
   masternode-budget.cpp \
@@ -287,6 +298,8 @@ libbitcoin_common_a_SOURCES = \
   chainparams.cpp \
   coins.cpp \
   compressor.cpp \
+  evo/file.cpp \
+  evo/dapi.cpp \
   primitives/block.cpp \
   primitives/transaction.cpp \
   core_read.cpp \

src/clientversion.h

@@ -15,8 +15,8 @@
 
 //! These need to be macros, as clientversion.cpp's and dash*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 0
-#define CLIENT_VERSION_MINOR 12
-#define CLIENT_VERSION_REVISION 1
+#define CLIENT_VERSION_MINOR 13
+#define CLIENT_VERSION_REVISION 0
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build