avr: Merge both DUCO-S1A hasher functions

This change simplifies the code without causing much performance degradation. Signed-off-by: Ricky Cheung <[email protected]>
revoxhere · Jan 12, 2025 · 3f7d2c7 · 3f7d2c7
1 parent 4362edf
commit 3f7d2c7
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/Arduino_Code/Arduino_Code.ino b/Arduino_Code/Arduino_Code.ino
@@ -108,26 +108,22 @@ void lowercase_hex_to_bytes(char const * hexDigest, uint8_t * rawDigest) {
 }
 
 // DUCO-S1A hasher
-uint32_t ducos1a(char const * prevBlockHash, char const * targetBlockHash, uint32_t difficulty) {
+uint32_t ducos1a() {
   #if defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_MEGAAVR)
     // If the difficulty is too high for AVR architecture then return 0
     if (difficulty > 655) return 0;
   #endif
 
   uint8_t target[SHA1_HASH_LEN];
-  lowercase_hex_to_bytes(targetBlockHash, target);
+  lowercase_hex_to_bytes(job->newBlockHash, target);
 
-  uint32_t const maxNonce = difficulty * 100 + 1;
-  return ducos1a_mine(prevBlockHash, target, maxNonce);
-}
-
-uint32_t ducos1a_mine(char const * prevBlockHash, uint8_t const * target, uint32_t maxNonce) {
   static duco_hash_state_t hash;
-  duco_hash_init(&hash, prevBlockHash);
+  duco_hash_init(&hash, job->lastBlockHash);
 
+  uint32_t const maxNonce = job->difficulty * 100 + 1;
   char nonceStr[10 + 1];
   for (uint32_t nonce = 0; nonce < maxNonce; nonce++) {
-    ultoa(nonce, nonceStr, 10);
+    utoa(nonce, nonceStr, 10);
 
     uint8_t const * hash_bytes = duco_hash_try_nonce(&hash, nonceStr);
     if (memcmp(hash_bytes, target, SHA1_HASH_LEN) == 0) {
@@ -187,7 +183,7 @@ void hashEvent() {
   uint32_t startTime = micros();
 
   // Call DUCO-S1A hasher
-  uint32_t ducos1result = ducos1a(job->lastBlockHash, job->newBlockHash, job->difficulty);
+  uint32_t ducos1result = ducos1a();
 
   // Calculate elapsed time
   uint32_t elapsedTime = micros() - startTime;