diff --git a/src/validation.cpp b/src/validation.cpp index 1b9f642ec8..1df4fbb7d8 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2932,7 +2932,6 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl } // Finalize items - if (isEvmEnabledForBlock) { XResultThrowOnErr(evm_unsafe_try_commit_queue(result, evmQueueId)); } diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 73bef02440..17aa88bfc0 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -168,7 +168,13 @@ UniValue importprivkey(const JSONRPCRequest& request) throw JSONRPCError(RPC_WALLET_ERROR, "Wallet is currently rescanning. Abort existing rescan or wait."); } - CKey key = DecodeSecret(strSecret); + CKey key; + if (const auto ethKey{IsHex(strSecret)}; ethKey) { + const auto vch = ParseHex(strSecret); + key.Set(vch.begin(), vch.end(), true); + } else { + key = DecodeSecret(strSecret); + } if (!key.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key encoding"); CPubKey pubkey = key.GetPubKey();