Skip to content

Commit

Permalink
change randomx to rx2
Browse files Browse the repository at this point in the history
  • Loading branch information
djm34 committed Dec 17, 2020
1 parent 9090928 commit 66f4f78
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,8 @@ crypto_libbitcoin_crypto_a_SOURCES = \
crypto/RandomX/blake2/blake2b.c \
crypto/RandomX/jit_compiler_x86.cpp \
crypto/RandomX/jit_compiler_x86_static.S \
crypto/randomx.h \
crypto/randomx.cpp \
crypto/rx2.h \
crypto/rx2.cpp \
cpp-ethereum/utils/libscrypt/b64.c \
cpp-ethereum/utils/libscrypt/b64.h \
cpp-ethereum/utils/libscrypt/crypto-mcf.c \
Expand Down
2 changes: 1 addition & 1 deletion src/crypto/randomx.cpp → src/crypto/rx2.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "uint256.h"
#include <string.h>
#include "util.h"
#include "randomx.h"
#include "rx2.h"
#include "RandomX/randomx.h"


Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/primitives/block.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "util.h"
#include "chainparams.h"
#include "versionbits.h"
#include "crypto/randomx.h"
#include "crypto/rx2.h"


uint256 CBlockHeader::GetHash(int nHeight,int Mining) const
Expand Down
6 changes: 3 additions & 3 deletions src/rpcmining.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "script/script_error.h"
#include "validationinterface.h"
#include "versionbits.h"
#include "crypto/randomx.h"
#include "crypto/rx2.h"
#ifdef ENABLE_WALLET
#include "db.h"
#include "wallet.h"
Expand Down Expand Up @@ -265,7 +265,7 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
else if ((chainActive.Height()+1) < Params().SwitchRandomXBlock())
obj.push_back(Pair("algo", "phi2"));
else
obj.push_back(Pair("algo", "randomx"));
obj.push_back(Pair("algo", "rx2"));


obj.push_back(Pair("segwit", IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus()) ));
Expand Down Expand Up @@ -911,7 +911,7 @@ UniValue getwork(const UniValue& params, bool fHelp) {
else if ((chainActive.Height()+1) < Params().SwitchRandomXBlock())
result.push_back(Pair("algo", "phi2"));
else
result.push_back(Pair("algo", "randomx"));
result.push_back(Pair("algo", "rx2"));

result.push_back(Pair("midstate", HexStr(BEGIN(pmidstate), END(pmidstate))));
if (pblock->nVersion & (1 << 30))
Expand Down

0 comments on commit 66f4f78

Please sign in to comment.