Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 18 additions & 3 deletions src/Qiner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ static std::atomic<char> state(0);

static unsigned char computorPublicKey[32];
static unsigned char randomSeed[32];
// Epoch-start Spectrum Digest selects the Addition training subset; empty (all zero) when none is provided.
static unsigned char epochStartSpectrumDigest[32];
static std::atomic<long long> numberOfMiningIterations(0);
static std::atomic<unsigned int> numberOfFoundSolutions(0);
static std::queue<std::array<unsigned char, 32>> foundNonce;
Expand Down Expand Up @@ -188,7 +190,8 @@ using HyperIdentityMiner = score_hyberidentity::Miner<
int miningThreadProc()
{
std::unique_ptr<AdditionMiner> additionMiner(new AdditionMiner());
additionMiner->initialize(randomSeed);
// Addition requires the epoch-start Spectrum Digest; it drives the training subset.
additionMiner->initialize(randomSeed, epochStartSpectrumDigest);

std::unique_ptr<HyperIdentityMiner> hyperIdentityMiner(new HyperIdentityMiner());
hyperIdentityMiner->initialize(randomSeed);
Expand Down Expand Up @@ -365,9 +368,9 @@ static void hexToByte(const char* hex, uint8_t* byte, const int sizeInByte)
int main(int argc, char* argv[])
{
std::vector<std::thread> miningThreads;
if (argc != 7)
if (argc != 7 && argc != 8)
{
printf("Usage: Qiner [Node IP] [Node Port] [MiningID] [Signing Seed] [Mining Seed] [Number of threads]\n");
printf("Usage: Qiner [Node IP] [Node Port] [MiningID] [Signing Seed] [Mining Seed] [Number of threads] [Epoch-start Spectrum Digest (optional)]\n");
}
else
{
Expand Down Expand Up @@ -396,6 +399,18 @@ int main(int argc, char* argv[])
//getIdentityFromPublicKey(signingPublicKey, miningID, false);

hexToByte(argv[5], randomSeed, 32);

// Epoch-start Spectrum Digest is optional; without it the Addition training subset uses an empty digest.
if (argc == 8)
{
hexToByte(argv[7], epochStartSpectrumDigest, 32);
}
else
{
memset(epochStartSpectrumDigest, 0, sizeof(epochStartSpectrumDigest));
printf("WARNING: no Epoch-start Spectrum Digest provided, using an empty one for the Addition training subset.\n");
}

unsigned int numberOfThreads = atoi(argv[6]);
printf("%d threads are used.\n", numberOfThreads);
miningThreads.reserve(numberOfThreads);
Expand Down
Loading