Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RPC][MN] Serialize in ADDRV2 for TorV3 in RPC's #2873

Merged
merged 2 commits into from
Aug 10, 2023
Merged

[RPC][MN] Serialize in ADDRV2 for TorV3 in RPC's #2873

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afd0c73
Fix MNB Serialization for ADDRv2 in RPCs
Liquid369 Jul 6, 2023
6d3d535
Deserialize AddrV1 first if fails deserialize AddrV2
Liquid369 Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions src/rpc/masternode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "masternode-payments.h"
#include "masternodeconfig.h"
#include "masternodeman.h"
#include "netaddress.h"
#include "netbase.h"
#include "tiertwo/tiertwo_sync_state.h"
#include "rpc/server.h"
Expand Down Expand Up @@ -390,9 +391,11 @@ void RelayMNB(CMasternodeBroadcast& mnb, const bool fSucces)

void SerializeMNB(UniValue& statusObjRet, const CMasternodeBroadcast& mnb, const bool fSuccess, int& successful, int& failed)
{
bool isBIP155 = mnb.addr.IsAddrV1Compatible();
int version = isBIP155 ? PROTOCOL_VERSION | ADDRV2_FORMAT : PROTOCOL_VERSION;
if(fSuccess) {
successful++;
CDataStream ssMnb(SER_NETWORK, PROTOCOL_VERSION);
CDataStream ssMnb(SER_NETWORK, version);
ssMnb << mnb;
statusObjRet.pushKV("hex", HexStr(ssMnb));
} else {
Expand Down Expand Up @@ -875,11 +878,7 @@ UniValue getmasternodescores(const JSONRPCRequest& request)
return obj;
}

bool DecodeHexMnb(CMasternodeBroadcast& mnb, std::string strHexMnb) {

if (!IsHex(strHexMnb))
return false;

bool DecodeAddrV1(CMasternodeBroadcast& mnb, std::string strHexMnb) {
std::vector<unsigned char> mnbData(ParseHex(strHexMnb));
CDataStream ssData(mnbData, SER_NETWORK, PROTOCOL_VERSION);
try {
Expand All @@ -891,6 +890,27 @@ bool DecodeHexMnb(CMasternodeBroadcast& mnb, std::string strHexMnb) {

return true;
}

bool DecodeHexMnb(CMasternodeBroadcast& mnb, std::string strHexMnb) {

if (!IsHex(strHexMnb))
return false;

bool MNAddrV1 = DecodeAddrV1(mnb, strHexMnb);
if (!MNAddrV1) {
std::vector<unsigned char> mnbData(ParseHex(strHexMnb));
CDataStream ssData(mnbData, SER_NETWORK, PROTOCOL_VERSION | ADDRV2_FORMAT);
try {
ssData >> mnb;
}
catch (const std::exception&) {
return false;
}
return true;
}
return true;
}

UniValue createmasternodebroadcast(const JSONRPCRequest& request)
{
CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
Expand Down