Improves keccak256 perf (#3866)

jangko · web-flow · commit 84408c93632d · 2025-12-10T04:18:09.000Z
* Improves keccak256 perf

Compared to nimcrypto, this keccak impl from tuned
Boring SSL only takes average 24 units of time, and nimcrypto
takes 43 units of time.

In addition to that, two hash function specialized for
Address and Hash32 also further improves hashing speed.
Address/20 bytes input length: takes 5 units of time compared
to general hash 9 units of time.
Hash32/32 bytes input length: takes 2 units of time compared
to general hash 4 units of time. (Data size alignment improves
hash time significantly)

* Bump nim-eth

* Fix tests

* Oops
diff --git a/execution_chain/networking/discoveryv4.nim b/execution_chain/networking/discoveryv4.nim
@@ -13,11 +13,11 @@ import
   std/[times, net],
   chronos,
   stint,
-  nimcrypto/keccak,
   chronicles,
   stew/objects,
   results,
   eth/rlp,
+  eth/keccak/keccak,
   eth/common/keys,
   eth/enode/enode,
   ./discoveryv4/kademlia
@@ -54,7 +54,7 @@ type
 
   DiscResult*[T] = Result[T, cstring]
 
-  keccak256 = keccak.keccak256
+  Keccak256 = keccak.Keccak256
 
   UnpackedMsg = object
     cmdId: CommandId
@@ -90,13 +90,13 @@ proc pack(cmdId: CommandId, payload: openArray[byte], pk: PrivateKey): seq[byte]
   result[MAC_SIZE ..< MAC_SIZE + SIG_SIZE] =
     pk.sign(result.toOpenArray(HEAD_SIZE, result.high)).toRaw()
   result[0 ..< MAC_SIZE] =
-    keccak256.digest(result.toOpenArray(MAC_SIZE, result.high)).data
+    Keccak256.digest(result.toOpenArray(MAC_SIZE, result.high)).data
 
 proc validateMsgHash(msg: openArray[byte]): DiscResult[MDigest[256]] =
   if msg.len > HEAD_SIZE:
     var ret: MDigest[256]
     ret.data[0 .. ^1] = msg.toOpenArray(0, ret.data.high)
-    if ret == keccak256.digest(msg.toOpenArray(MAC_SIZE, msg.high)):
+    if ret == Keccak256.digest(msg.toOpenArray(MAC_SIZE, msg.high)):
       ok(ret)
     else:
       err("disc: invalid message hash")
diff --git a/execution_chain/networking/discoveryv4/kademlia.nim b/execution_chain/networking/discoveryv4/kademlia.nim
@@ -10,7 +10,7 @@
 
 import
   std/[tables, hashes, times, algorithm, sets, sequtils],
-  chronos, chronicles, stint, nimcrypto/keccak, metrics, results,
+  chronos, chronicles, stint, eth/keccak/keccak, metrics, results,
   eth/common/keys, eth/p2p/discoveryv5/random2,
   eth/enode/enode
 
@@ -70,7 +70,7 @@ const
 proc len(r: RoutingTable): int
 
 proc toNodeId*(pk: PublicKey): NodeId =
-  readUintBE[256](keccak256.digest(pk.toRaw()).data)
+  readUintBE[256](Keccak256.digest(pk.toRaw()).data)
 
 proc newNode*(pk: PublicKey, address: Address): Node =
   result.new()
diff --git a/execution_chain/networking/rlpx/auth.nim b/execution_chain/networking/rlpx/auth.nim
@@ -15,17 +15,16 @@
 {.push raises: [].}
 
 import
-  nimcrypto/[rijndael, keccak, utils],
+  nimcrypto/[rijndael, utils],
   stew/[arrayops, byteutils, endians2, objects],
   results,
   eth/rlp,
+  eth/keccak/keccak,
   eth/common/keys,
   ./ecies
 
 export results
 
-type keccak256 = keccak.keccak256
-
 const
   # Auth message sizes
   MsgLenLenEIP8* = 2
@@ -66,6 +65,8 @@ const
     ## ack-vsn = 4
 
 type
+  Keccak256 = keccak.Keccak256
+  
   Nonce* = array[KeyLength, byte]
 
   HandshakeFlag* = enum
@@ -95,8 +96,8 @@ type
   ConnectionSecret* = object
     aesKey*: array[aes256.sizeKey, byte]
     macKey*: array[KeyLength, byte]
-    egressMac*: keccak256
-    ingressMac*: keccak256
+    egressMac*: Keccak256
+    ingressMac*: Keccak256
 
   AuthResult*[T] = Result[T, AuthError]
 
@@ -343,8 +344,8 @@ proc getSecrets*(
   ## Derive secrets from handshake `h` using encrypted AuthMessage `authmsg` and
   ## encrypted AckMessage `ackmsg`.
   var
-    ctx0: keccak256
-    ctx1: keccak256
+    ctx0: Keccak256
+    ctx1: Keccak256
     mac1: MDigest[256]
     secret: ConnectionSecret
 
diff --git a/execution_chain/networking/rlpx/rlpxcrypt.nim b/execution_chain/networking/rlpx/rlpxcrypt.nim
@@ -12,7 +12,8 @@
 {.push raises: [].}
 
 import
-  nimcrypto/[bcmode, keccak, rijndael, utils], results
+  nimcrypto/[bcmode, rijndael, utils], results,
+  eth/keccak/keccak
 from auth import ConnectionSecret
 
 export results
@@ -23,13 +24,15 @@ const
   maxUInt24 = (not uint32(0)) shl 8
 
 type
+  Keccak256 = keccak.Keccak256
+
   SecretState* = object
     ## Object represents current encryption/decryption context.
     aesenc*: CTR[aes256]
     aesdec*: CTR[aes256]
     macenc*: ECB[aes256]
-    emac*: keccak256
-    imac*: keccak256
+    emac*: Keccak256
+    imac*: Keccak256
 
   RlpxError* = enum
     IncorrectMac = "rlpx: MAC verification failed"
@@ -90,7 +93,7 @@ proc encrypt*(c: var SecretState, header: openArray[byte],
   ## `frame` must not be zero length.
   ## `output` must be at least `encryptedLength(len(frame))` length.
   var
-    tmpmac: keccak256
+    tmpmac: Keccak256
     aes: array[RlpHeaderLength, byte]
   let length = encryptedLength(len(frame))
   let frameLength = roundup16(len(frame))
@@ -166,7 +169,7 @@ proc decryptHeader*(c: var SecretState, data: openArray[byte]): RlpxResult[RlpxH
   ## `header` must be at least `RlpHeaderLength + RlpMacLength` length.
 
   var
-    tmpmac: keccak256
+    tmpmac: Keccak256
     aes: array[RlpHeaderLength, byte]
 
   if len(data) < RlpHeaderLength + RlpMacLength:
@@ -204,7 +207,7 @@ proc decryptBody*(c: var SecretState, data: openArray[byte], bodysize: int,
   ##
   ## On success completion `outlen` will hold actual size of decrypted body.
   var
-    tmpmac: keccak256
+    tmpmac: Keccak256
     aes: array[RlpHeaderLength, byte]
   let rsize = roundup16(bodysize)
   if len(data) < rsize + RlpMacLength:
diff --git a/tests/networking/fuzzing/discoveryv4/fuzz.nim b/tests/networking/fuzzing/discoveryv4/fuzz.nim
@@ -9,8 +9,8 @@
 
 import
   std/net,
-  testutils/fuzzing, chronicles, nimcrypto/keccak,
-  eth/[common/keys],
+  testutils/fuzzing, chronicles,
+  eth/[common/keys, keccak/keccak],
   results,
   ../../../../execution_chain/networking/discoveryv4,
   ../../p2p_test_helper
@@ -22,7 +22,7 @@ proc packData(payload: openArray[byte], pk: PrivateKey): seq[byte] =
   let
     payloadSeq = @payload
     signature = @(pk.sign(payload).toRaw())
-    msgHash = keccak256.digest(signature & payloadSeq)
+    msgHash = Keccak256.digest(signature & payloadSeq)
   result = @(msgHash.data) & signature & payloadSeq
 
 init:
diff --git a/tests/networking/test_auth.nim b/tests/networking/test_auth.nim
@@ -11,7 +11,8 @@
 
 import
   unittest2,
-  nimcrypto/[utils, keccak],
+  nimcrypto/utils,
+  eth/keccak/keccak,
   eth/common/keys,
   ../../execution_chain/networking/rlpx/auth
 
diff --git a/tests/networking/test_crypt.nim b/tests/networking/test_crypt.nim
@@ -11,7 +11,8 @@
 
 import
   unittest2,
-  nimcrypto/[utils, keccak, sysrand],
+  nimcrypto/[utils, sysrand],
+  eth/keccak/keccak,
   eth/common/keys,
   ../../execution_chain/networking/rlpx/[auth, rlpxcrypt]
 
diff --git a/tests/networking/test_discoveryv4.nim b/tests/networking/test_discoveryv4.nim
@@ -13,8 +13,8 @@ import
   std/sequtils,
   chronos,
   stew/byteutils,
-  nimcrypto/keccak,
   testutils/unittests,
+  eth/keccak/keccak,
   eth/common/keys,
   ./stubloglevel,
   ../../execution_chain/networking/discoveryv4
@@ -36,7 +36,7 @@ proc packData(payload: openArray[byte], pk: PrivateKey): seq[byte] =
   let
     payloadSeq = @payload
     signature = @(pk.sign(payload).toRaw())
-    msgHash = keccak256.digest(signature & payloadSeq)
+    msgHash = Keccak256.digest(signature & payloadSeq)
   result = @(msgHash.data) & signature & payloadSeq
 
 proc nodeIdInNodes(id: NodeId, nodes: openArray[Node]): bool =
diff --git a/vendor/nim-eth b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit 9cc328a4ca4aff1b3232cada71744ebffcadb290
+Subproject commit 01ce3cb80bf10f1ea10007032005f31b9a8a8d8c
