Bug fixes

Author: psolstice

src/rpc/client.cpp

@@ -207,6 +207,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     // Spark names
     { "registersparkname", 2, {} },
     { "getsparknames", 0, {} },
+    { "requestsparknametransfer", 3, {} },
 
     /* Evo spork */
     { "spork", 2, "features"},

src/spark/state.cpp

@@ -330,6 +330,7 @@ bool ConnectBlockSpark(
                         break;
 
                     case CSparkNameTxData::opTransfer:
+                        // old name data goes to removed list
                         pindexNew->removedSparkNames[sparkName.first] = 
                             CSparkNameBlockIndexData(sparkName.second.name,
                                 sparkName.second.oldSparkAddress,
@@ -375,7 +376,7 @@ bool ConnectBlockSpark(
     }
 
     CSparkNameManager *sparkNameManager = CSparkNameManager::GetInstance();
-    
+
     auto removedNames = sparkNameManager->RemoveSparkNamesLosingValidity(pindexNew->nHeight);
     for (const auto &name: removedNames)
         pindexNew->removedSparkNames[name.first] = name.second;

src/sparkname.cpp

@@ -189,13 +189,13 @@ bool CSparkNameManager::CheckSparkNameTx(const CTransaction &tx, int nHeight, CV
     if (sparkNames.count(ToUpper(sparkNameData.name)) > 0) {
         // it's possible to change any metadata of the existing name but if the spark address is being
         // tranferred, new name shouldn't be already registered
-        if (fSparkNameTransfer || sparkNames[ToUpper(sparkNameData.name)].sparkAddress != sparkNameData.sparkAddress)
+        if (!fSparkNameTransfer && sparkNames[ToUpper(sparkNameData.name)].sparkAddress != sparkNameData.sparkAddress)
             return state.DoS(100, error("CheckSparkNameTx: name already exists"));
 
         fUpdateExistingRecord = true;
     }
 
-    if (!fUpdateExistingRecord && sparkNameAddresses.count(sparkNameData.sparkAddress) > 0)
+    if ((fSparkNameTransfer || !fUpdateExistingRecord) && sparkNameAddresses.count(sparkNameData.sparkAddress) > 0)
         return state.DoS(100, error("CheckSparkNameTx: spark address is already used for another name"));
 
     // calculate the hash of the all the transaction except the spark ownership proof
@@ -204,7 +204,6 @@ bool CSparkNameManager::CheckSparkNameTx(const CTransaction &tx, int nHeight, CV
 
     txMutable.vExtraPayload.erase(txMutable.vExtraPayload.begin() + sparkNameDataPos, txMutable.vExtraPayload.end());
     sparkNameDataCopy.addressOwnershipProof.clear();
-    sparkNameDataCopy.transferOwnershipProof.clear();
     CDataStream serializedSparkNameData(SER_NETWORK, PROTOCOL_VERSION);
     serializedSparkNameData << sparkNameDataCopy;
     txMutable.vExtraPayload.insert(txMutable.vExtraPayload.end(), serializedSparkNameData.begin(), serializedSparkNameData.end());
@@ -267,16 +266,17 @@ bool CSparkNameManager::CheckSparkNameTx(const CTransaction &tx, int nHeight, CV
         }
 
         CHashWriter sparkNameDataStream(SER_GETHASH, PROTOCOL_VERSION);
+        sparkNameDataCopy.transferOwnershipProof.clear();
         sparkNameDataStream << sparkNameDataCopy;
 
-        CDataStream hashStream(SER_NETWORK, PROTOCOL_VERSION);
+        CHashWriter hashStream(SER_NETWORK, PROTOCOL_VERSION);
         hashStream << "SparkNameTransferProof";
         hashStream << sparkNameData.oldSparkAddress << sparkNameData.sparkAddress;
         hashStream << sparkNameDataStream.GetHash();
 
         spark::Scalar mTransfer;
         try {
-            mTransfer.SetHex(hashStream.str().c_str());
+            mTransfer.SetHex(hashStream.GetHash().ToString());
         }
         catch (const std::exception &) {
             return state.DoS(100, error("CheckSparkNameTx: hash is out of range"));

src/wallet/rpcwallet.cpp

@@ -4039,7 +4039,7 @@ UniValue registersparkname(const JSONRPCRequest& request) {
         throw JSONRPCError(RPC_WALLET_ERROR, "Spark name transfers are not activated yet");
     }
 
-    if (request.params.size() < 3 || request.params.size() > 4)
+    if (!fTransfer && request.params.size() > 4)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameters");
 
     std::string sparkName = request.params[0].get_str();
@@ -4050,14 +4050,16 @@ UniValue registersparkname(const JSONRPCRequest& request) {
     if (numberOfYears < 1 || numberOfYears > 10)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid number of years");
 
-    if (request.params.size() >= 4)
-        additionalData = request.params[3].get_str();
+    int additionalDataIndex = fTransfer ? 5 : 3;
+    if (request.params.size() > additionalDataIndex)
+        additionalData = request.params[additionalDataIndex].get_str();
 
     if (sparkName.empty() || sparkName.size() > 20)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid spark name");
 
     CSparkNameTxData    sparkNameData;
     sparkNameData.nVersion = chainHeight >= consensusParams.nSparkNamesV2StartBlock ? CSparkNameTxData::CURRENT_VERSION : 1;
+    sparkNameData.operationType = fTransfer ? CSparkNameTxData::opTransfer : CSparkNameTxData::opRegister;
     sparkNameData.name = sparkName;
     sparkNameData.sparkAddress = sparkAddress;
     sparkNameData.additionalInfo = additionalData;
@@ -6053,8 +6055,8 @@ static const CRPCCommand commands[] =
     { "wallet",             "identifysparkcoins",       &identifysparkcoins,       false,  {} },
     { "wallet",             "getsparkcoinaddr",         &getsparkcoinaddr,         false,  {} },
     { "wallet",             "registersparkname",        &registersparkname,        false,  {} },
-    { "wallet",             "requestsparknamenametransfer", &requestsparknametransfer, false,  {} },
-    { "wallet",             "tranfersparkname",         &transfersparkname,        false,  {} },
+    { "wallet",             "requestsparknametransfer", &requestsparknametransfer, false,  {} },
+    { "wallet",             "transfersparkname",        &transfersparkname,        false,  {} },
     { "wallet",             "getsparknames",            &getsparknames,            true,   {} },
 
     //bip47