From a1f7e9d9edf75ba4e76e88d51930ca466d2e3633 Mon Sep 17 00:00:00 2001 From: dzwdz Date: Wed, 31 May 2023 10:11:35 +0000 Subject: [PATCH] Reenable deterministic mining. --- main.c | 5 ----- worker_batch_pass.inc.h | 3 +++ worker_fast_pass.inc.h | 3 +++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/main.c b/main.c index 1fb1e06..82cfb4e 100644 --- a/main.c +++ b/main.c @@ -677,11 +677,6 @@ int main(int argc,char **argv) filters_add(arg); } - if (deterministic) { - fprintf(stderr, "deterministic trustless mining isn't supported yet.\n"); - exit(1); - } - if (yamlinput && yamloutput) { fprintf(stderr,"both -y and -Y does not make sense\n"); exit(1); diff --git a/worker_batch_pass.inc.h b/worker_batch_pass.inc.h index 0fa49ff..856f311 100644 --- a/worker_batch_pass.inc.h +++ b/worker_batch_pass.inc.h @@ -54,6 +54,9 @@ initseed: ed25519_seckey_expand(sk,seed); ge_scalarmult_base(&ge_public,sk); + if (pubkey_base_initialized) { + ge25519_add(&ge_public, &ge_public, &PUBKEY_BASE); + } for (counter = oldcounter = 0;counter < DETERMINISTIC_LOOP_COUNT - (BATCHNUM - 1) * 8;counter += BATCHNUM * 8) { ge_p1p1 ALIGN(16) sum; diff --git a/worker_fast_pass.inc.h b/worker_fast_pass.inc.h index 793d600..ec90a6e 100644 --- a/worker_fast_pass.inc.h +++ b/worker_fast_pass.inc.h @@ -49,6 +49,9 @@ initseed: ed25519_seckey_expand(sk,seed); ge_scalarmult_base(&ge_public,sk); + if (pubkey_base_initialized) { + ge25519_add(&ge_public, &ge_public, &PUBKEY_BASE); + } ge_p3_tobytes(pk,&ge_public); for (counter = oldcounter = 0;counter < DETERMINISTIC_LOOP_COUNT;counter += 8) {