diff --git a/configure.ac b/configure.ac index 94d70e44d1..3878c751a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 4) -define(_CLIENT_VERSION_MINOR, 1) +define(_CLIENT_VERSION_MINOR, 2) define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 2c36f36aa7..986a326980 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -1625,7 +1625,7 @@ UniValue decodescript(const JSONRPCRequest& request) r.push_back(Pair("asset_name", transfer.strName)); r.push_back(Pair("amount", ValueFromAmount(transfer.nAmount))); if (!transfer.message.empty()) - r.push_back(Pair("message", transfer.message)); + r.push_back(Pair("message", EncodeAssetData(transfer.message))); if (transfer.nExpireTime) r.push_back(Pair("expire_time", transfer.nExpireTime)); diff --git a/src/version.h b/src/version.h index d825e8d1a9..8fbd3508d5 100644 --- a/src/version.h +++ b/src/version.h @@ -13,12 +13,12 @@ // Update these four values on every release cycle // These values should match the values in configure.ac // Used for checking the Ravencoin releases on github -static const std::string SOFTWARE_VERSION = "v4.1.0"; +static const std::string SOFTWARE_VERSION = "v4.2.0"; static const int MAIN_SOFTWARE_VERSION = 4; -static const int SECOND_SOFTWARE_VERSION = 1; +static const int SECOND_SOFTWARE_VERSION = 2; static const int THIRD_SOFTWARE_VERSION = 0; -static const int PROTOCOL_VERSION = 70027; +static const int PROTOCOL_VERSION = 70028; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209;