X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fbitcoinrpc.cpp;h=a8ad00017272267f9128d33e3a23b7cb24730d55;hb=f1af842f0fd26cb19d6f1161f7b161ae5386b980;hp=9f39a032dcdb7df25b26e294bf8557bafd23dd9c;hpb=3176e0f244d929669aa3e1d81e0787d82d9150d3;p=novacoin.git

diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 9f39a03..a8ad000 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1806,6 +1806,50 @@ Value validateaddress(const Array& params, bool fHelp)
     return ret;
 }
 
+Value validatepubkey(const Array& params, bool fHelp)
+{
+    if (fHelp || !params.size() || params.size() > 2)
+        throw runtime_error(
+            "validatepubkey <novacoinpubkey>\n"
+            "Return information about <novacoinpubkey>.");
+
+    std::vector<unsigned char> vchPubKey = ParseHex(params[0].get_str());
+    bool isValid;
+
+    if(vchPubKey.size() == 33) // Compressed key
+        isValid = (vchPubKey[0] == 0x02 || vchPubKey[0] == 0x03);
+    else if(vchPubKey.size() == 65) // Uncompressed key
+        isValid = vchPubKey[0] == 0x04;
+    else
+        isValid = false;
+
+    CBitcoinAddress address(vchPubKey);
+    isValid = isValid ? address.IsValid() : false;
+
+    Object ret;
+    ret.push_back(Pair("isvalid", isValid));
+    if (isValid)
+    {
+        // Call Hash160ToAddress() so we always return current ADDRESSVERSION
+        // version of the address:
+        string currentAddress = address.ToString();
+        ret.push_back(Pair("address", currentAddress));
+        if (pwalletMain->HaveKey(address))
+        {
+            ret.push_back(Pair("ismine", true));
+            CKey key;
+            key.SetPubKey(vchPubKey);
+            ret.push_back(Pair("iscompressed", key.IsCompressed()));
+        }
+        else
+            ret.push_back(Pair("ismine", false));
+        if (pwalletMain->mapAddressBook.count(address))
+            ret.push_back(Pair("account", pwalletMain->mapAddressBook[address]));
+    }
+    return ret;
+}
+
+
 Value getwork(const Array& params, bool fHelp)
 {
     if (fHelp || params.size() > 1)
@@ -2388,6 +2432,21 @@ Value repairwallet(const Array& params, bool fHelp)
     return result;
 }
 
+// NovaCoin: resend unconfirmed wallet transactions
+Value resendtx(const Array& params, bool fHelp)
+{
+    if (fHelp || params.size() > 1)
+        throw runtime_error(
+            "resendtx\n"
+            "Re-send unconfirmed transactions.\n"
+        );
+
+    ResendWalletTransactions();
+
+    return Value::null;
+}
+
+
 // ppcoin: make a public-private key pair
 Value makekeypair(const Array& params, bool fHelp)
 {
@@ -2524,6 +2583,7 @@ static const CRPCCommand vRPCCommands[] =
     { "walletlock",             &walletlock,             true },
     { "encryptwallet",          &encryptwallet,          false },
     { "validateaddress",        &validateaddress,        true },
+    { "validatepubkey",         &validatepubkey,         true },
     { "getbalance",             &getbalance,             false },
     { "move",                   &movecmd,                false },
     { "sendfrom",               &sendfrom,               false },
@@ -2549,6 +2609,7 @@ static const CRPCCommand vRPCCommands[] =
     { "reservebalance",         &reservebalance,         false},
     { "checkwallet",            &checkwallet,            false},
     { "repairwallet",           &repairwallet,           false},
+    { "resendtx",               &resendtx,               false},
     { "makekeypair",            &makekeypair,            false},
     { "sendalert",              &sendalert,              false},
 };