Merge branch 'withjackscommits' into real2

contrib/seeds/nodes_main.txt

@@ -1 +1,2 @@
-52.27.78.56:9246
+45.32.39.241:9246
+45.32.40.180:9246

contrib/seeds/nodes_test.txt

@@ -1,5 +1,7 @@
 # List of fixed seed nodes for testnet
 
+45.32.39.241:19246
+
 # Onion nodes
 #thfsmmn2jbitcoin.onion
 #it2pj4f7657g3rhi.onion

reproducable-build

@@ -1,6 +1,8 @@
 sudo apt-get install build-essential python-dev libbz2-dev libtool autotools-dev autoconf git pkg-config
+
 mkdir dependencies
 cd dependencies
+
 wget http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz
 tar xf db-4.8.30.NC.tar.gz
 export BDB_PREFIX="`pwd`/bdb"
@@ -9,26 +11,41 @@ cd db-4.8.30.NC/build_unix
 make
 make install
 cd ../../
+
 wget https://www.openssl.org/source/openssl-1.0.1p.tar.gz
 tar xf openssl-1.0.1p.tar.gz
 export OPENSSL_PREFIX="`pwd`/openssl_build"
+mkdir $OPENSSL_PREFIX
 cd openssl-1.0.1p
-./Configure --prefix=$OPENSSL_PREFIX --openssldir=$OPENSSL_PREFIX/ssl [linux-generic32/linux-x86_64] -fPIC -static no-shared no-dso
+./Configure --prefix=$OPENSSL_PREFIX --openssldir=$OPENSSL_PREFIX/ssl linux-x86_64 -fPIC -static no-shared no-dso
 make
 make install
-export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${OPENSSL_BUILD}/lib/pkgconfig/"
+export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${OPENSSL_PREFIX}/lib/pkgconfig/"
 cd ..
+
 wget http://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.tar.bz2/download -O boost_1_59_0.tar.bz2
 tar xf boost_1_59_0.tar.bz2
+export BOOST_ROOT="`pwd`/boost_1_59_0"
 cd boost_1_59_0
-export BOOST_ROOT=`pwd`
 ./bootstrap.sh
 ./b2 link=static cxxflags=-fPIC stage
 cd ../../
+
+mkdir libevent_build
+git clone https://github.com/libevent/libevent.git
+export LIBEVENT_PREFIX="`pwd`/libevent_build"
+cd libevent
+./autogen.sh
+./configure --prefix=$LIBEVENT_PREFIX --enable-static --disable-shared --with-pic LDFLAGS="-L${OPENSSL_PREFIX}/lib/" CPPFLAGS="-I${OPENSSL_PREFIX}/include"
+make
+make install
+cd ..
+
 git clone https://github.com/lbryio/lbrycrd
 cd lbrycrd
+git checkout real
 ./autogen.sh
-./configure --without-gui LDFLAGS="-L${OPENSSL_PREFIX}/lib/ -L${BDB_PREFIX}/lib/ -static-libstdc++" CPPFLAGS="-I${OPENSSL_PREFIX}/include -I${BDB_PREFIX}/include"
+./configure --without-gui LDFLAGS="-L${OPENSSL_PREFIX}/lib/ -L${BDB_PREFIX}/lib/ -L${LIBEVENT_PREFIX}/lib/ -static-libstdc++" CPPFLAGS="-I${OPENSSL_PREFIX}/include -I${BDB_PREFIX}/include -I${LIBEVENT_PREFIX}/include/"
 make
 strip src/lbrycrdd
 strip src/lbrycrd-cli

src/chainparams.cpp

@@ -165,7 +165,10 @@ public:
         vSeeds.clear();
         vFixedSeeds.clear();
 
-        vSeeds.push_back(CDNSSeedData("lbrycrd.lbry.io", "seed.lbrycrd.lbry.io")); // lbry.io
+        vSeeds.push_back(CDNSSeedData("lbry.io", "dnsseed1.lbry.io")); // lbry.io
+        vSeeds.push_back(CDNSSeedData("lbry.io", "dnsseed2.lbry.io")); // lbry.io
+        vSeeds.push_back(CDNSSeedData("lbry.io", "dnsseed3.lbry.io")); // lbry.io
+
 
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,0x55);
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,0x7a);

src/chainparamsseeds.h

@@ -8,10 +8,11 @@
  * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.
  */
 static SeedSpec6 pnSeed6_main[] = {
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x1b,0x4e,0x38}, 8333}
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0x27,0xf1}, 9246},
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0x28,0xb4}, 9246}
 };
 
 static SeedSpec6 pnSeed6_test[] = {
-
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0x27,0xf1}, 19246}
 };
 #endif // BITCOIN_CHAINPARAMSSEEDS_H

src/rpc/claimtrie.cpp

@@ -520,3 +520,22 @@ UniValue getnameproof(const UniValue& params, bool fHelp)
 
     return proofToJSON(proof);
 }
+
+static const CRPCCommand commands[] =
+{ //  category              name                           actor (function)        okSafeMode
+  //  --------------------- ------------------------     -----------------------  ----------
+    { "Claimtrie",             "getclaimsintrie",         &getclaimsintrie,         true  },
+    { "Claimtrie",             "getclaimtrie",            &getclaimtrie,            true  },
+    { "Claimtrie",             "getvalueforname",         &getvalueforname,         true  },
+    { "Claimtrie",             "gettotalclaimednames",    &gettotalclaimednames,    true  },
+    { "Claimtrie",             "gettotalclaims",          &gettotalclaims,          true  },
+    { "Claimtrie",             "gettotalvalueofclaims",   &gettotalvalueofclaims,   true  },
+    { "Claimtrie",             "getclaimsfortx",          &getclaimsfortx,          true  },
+    { "Claimtrie",             "getnameproof",            &getnameproof,            true  },
+};
+
+void RegisterClaimTrieRPCCommands(CRPCTable &tableRPC)
+{
+    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
+        tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
+}

src/rpc/mining.cpp

@@ -857,6 +857,8 @@ static const CRPCCommand commands[] =
     { "mining",             "prioritisetransaction",  &prioritisetransaction,  true  },
     { "mining",             "getblocktemplate",       &getblocktemplate,       true  },
     { "mining",             "submitblock",            &submitblock,            true  },
+    { "mining",             "setgenerate",            &setgenerate,            true  },
+    { "mining",             "getgenerate",            &getgenerate,            true  },
 
     { "generating",         "generate",               &generate,               true  },
     { "generating",         "generatetoaddress",      &generatetoaddress,      true  },

src/rpc/register.h

@@ -19,6 +19,9 @@ void RegisterMiscRPCCommands(CRPCTable &tableRPC);
 void RegisterMiningRPCCommands(CRPCTable &tableRPC);
 /** Register raw transaction RPC commands */
 void RegisterRawTransactionRPCCommands(CRPCTable &tableRPC);
+/** Register claim trie RPC commands */
+void RegisterClaimTrieRPCCommands(CRPCTable &tableRPC);
+
 
 static inline void RegisterAllCoreRPCCommands(CRPCTable &tableRPC)
 {
@@ -27,6 +30,7 @@ static inline void RegisterAllCoreRPCCommands(CRPCTable &tableRPC)
     RegisterMiscRPCCommands(tableRPC);
     RegisterMiningRPCCommands(tableRPC);
     RegisterRawTransactionRPCCommands(tableRPC);
+    RegisterClaimTrieRPCCommands(tableRPC);
 }
 
 #endif

src/wallet/rpcwallet.cpp

@@ -3138,6 +3138,12 @@ static const CRPCCommand commands[] =
     { "wallet",             "walletpassphrasechange",   &walletpassphrasechange,   true  },
     { "wallet",             "walletpassphrase",         &walletpassphrase,         true  },
     { "wallet",             "removeprunedfunds",        &removeprunedfunds,        true  },
+    { "Claimtrie",           "claimname",               &claimname,                true  },
+    { "Claimtrie",           "updateclaim",             &updateclaim,              true  },
+    { "Claimtrie",           "abandonclaim",            &abandonclaim,             true  },
+    { "Claimtrie",           "listnameclaims",          &listnameclaims,           true  },
+    { "Claimtrie",           "supportclaim",            &supportclaim,             true  },
+    { "Claimtrie",           "abandonsupport",          &abandonsupport,           true  },
 };
 
 void RegisterWalletRPCCommands(CRPCTable &tableRPC)