fix: clarify HashOp::Keccak variant to refer to Keccak-256 (#217)

Co-authored-by: Carlos Rodriguez <[email protected]>
cosmos · Dec 14, 2023 · c7c7288 · c7c7288
1 parent dad0145
commit c7c7288
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 93 deletions.
diff --git a/go/proofs.pb.go b/go/proofs.pb.go
diff --git a/js/src/generated/codecimpl.d.ts b/js/src/generated/codecimpl.d.ts
@@ -6,7 +6,7 @@ export namespace ics23 {
     NO_HASH = 0,
     SHA256 = 1,
     SHA512 = 2,
-    KECCAK = 3,
+    KECCAK256 = 3,
     RIPEMD160 = 4,
     BITCOIN = 5,
     SHA512_256 = 6,

diff --git a/js/src/generated/codecimpl.js b/js/src/generated/codecimpl.js
@@ -25,7 +25,7 @@ $root.ics23 = (function() {
      * @property {number} NO_HASH=0 NO_HASH value
      * @property {number} SHA256=1 SHA256 value
      * @property {number} SHA512=2 SHA512 value
-     * @property {number} KECCAK=3 KECCAK value
+     * @property {number} KECCAK256=3 KECCAK256 value
      * @property {number} RIPEMD160=4 RIPEMD160 value
      * @property {number} BITCOIN=5 BITCOIN value
      * @property {number} SHA512_256=6 SHA512_256 value
@@ -38,7 +38,7 @@ $root.ics23 = (function() {
         values[valuesById[0] = "NO_HASH"] = 0;
         values[valuesById[1] = "SHA256"] = 1;
         values[valuesById[2] = "SHA512"] = 2;
-        values[valuesById[3] = "KECCAK"] = 3;
+        values[valuesById[3] = "KECCAK256"] = 3;
         values[valuesById[4] = "RIPEMD160"] = 4;
         values[valuesById[5] = "BITCOIN"] = 5;
         values[valuesById[6] = "SHA512_256"] = 6;
@@ -1244,7 +1244,7 @@ $root.ics23 = (function() {
             case 2:
                 message.hash = 2;
                 break;
-            case "KECCAK":
+            case "KECCAK256":
             case 3:
                 message.hash = 3;
                 break;
@@ -1274,7 +1274,7 @@ $root.ics23 = (function() {
             case 2:
                 message.prehashKey = 2;
                 break;
-            case "KECCAK":
+            case "KECCAK256":
             case 3:
                 message.prehashKey = 3;
                 break;
@@ -1304,7 +1304,7 @@ $root.ics23 = (function() {
             case 2:
                 message.prehashValue = 2;
                 break;
-            case "KECCAK":
+            case "KECCAK256":
             case 3:
                 message.prehashValue = 3;
                 break;
@@ -1639,7 +1639,7 @@ $root.ics23 = (function() {
             case 2:
                 message.hash = 2;
                 break;
-            case "KECCAK":
+            case "KECCAK256":
             case 3:
                 message.hash = 3;
                 break;
@@ -2307,7 +2307,7 @@ $root.ics23 = (function() {
             case 2:
                 message.hash = 2;
                 break;
-            case "KECCAK":
+            case "KECCAK256":
             case 3:
                 message.hash = 3;
                 break;

diff --git a/proto/cosmos/ics23/v1/proofs.proto b/proto/cosmos/ics23/v1/proofs.proto
@@ -9,7 +9,7 @@ enum HashOp {
   NO_HASH     = 0;
   SHA256      = 1;
   SHA512      = 2;
-  KECCAK      = 3;
+  KECCAK256   = 3;
   RIPEMD160   = 4;
   BITCOIN     = 5; // ripemd160(sha256(x))
   SHA512_256  = 6;

diff --git a/rust/src/cosmos.ics23.v1.rs b/rust/src/cosmos.ics23.v1.rs
@@ -270,7 +270,7 @@ pub enum HashOp {
     NoHash = 0,
     Sha256 = 1,
     Sha512 = 2,
-    Keccak = 3,
+    Keccak256 = 3,
     Ripemd160 = 4,
     /// ripemd160(sha256(x))
     Bitcoin = 5,
@@ -289,7 +289,7 @@ impl HashOp {
             HashOp::NoHash => "NO_HASH",
             HashOp::Sha256 => "SHA256",
             HashOp::Sha512 => "SHA512",
-            HashOp::Keccak => "KECCAK",
+            HashOp::Keccak256 => "KECCAK256",
             HashOp::Ripemd160 => "RIPEMD160",
             HashOp::Bitcoin => "BITCOIN",
             HashOp::Sha512256 => "SHA512_256",
@@ -304,7 +304,7 @@ impl HashOp {
             "NO_HASH" => Some(Self::NoHash),
             "SHA256" => Some(Self::Sha256),
             "SHA512" => Some(Self::Sha512),
-            "KECCAK" => Some(Self::Keccak),
+            "KECCAK256" => Some(Self::Keccak256),
             "RIPEMD160" => Some(Self::Ripemd160),
             "BITCOIN" => Some(Self::Bitcoin),
             "SHA512_256" => Some(Self::Sha512256),

diff --git a/rust/src/cosmos.ics23.v1.serde.rs b/rust/src/cosmos.ics23.v1.serde.rs
@@ -983,7 +983,7 @@ impl serde::Serialize for HashOp {
             Self::NoHash => "NO_HASH",
             Self::Sha256 => "SHA256",
             Self::Sha512 => "SHA512",
-            Self::Keccak => "KECCAK",
+            Self::Keccak256 => "KECCAK256",
             Self::Ripemd160 => "RIPEMD160",
             Self::Bitcoin => "BITCOIN",
             Self::Sha512256 => "SHA512_256",
@@ -1004,7 +1004,7 @@ impl<'de> serde::Deserialize<'de> for HashOp {
             "NO_HASH",
             "SHA256",
             "SHA512",
-            "KECCAK",
+            "KECCAK256",
             "RIPEMD160",
             "BITCOIN",
             "SHA512_256",
@@ -1056,7 +1056,7 @@ impl<'de> serde::Deserialize<'de> for HashOp {
                     "NO_HASH" => Ok(HashOp::NoHash),
                     "SHA256" => Ok(HashOp::Sha256),
                     "SHA512" => Ok(HashOp::Sha512),
-                    "KECCAK" => Ok(HashOp::Keccak),
+                    "KECCAK256" => Ok(HashOp::Keccak256),
                     "RIPEMD160" => Ok(HashOp::Ripemd160),
                     "BITCOIN" => Ok(HashOp::Bitcoin),
                     "SHA512_256" => Ok(HashOp::Sha512256),

diff --git a/rust/src/host_functions.rs b/rust/src/host_functions.rs
@@ -11,10 +11,10 @@ pub trait HostFunctionsProvider {
     /// The SHA-512 hash algorithm with its output truncated to 256 bits.
     fn sha2_512_truncated(message: &[u8]) -> [u8; 32];
 
-    /// SHA-3-512 hash function.
-    fn sha3_512(message: &[u8]) -> [u8; 64];
+    /// The Keccak-256 hash function.
+    fn keccak_256(message: &[u8]) -> [u8; 32];
 
-    /// Ripemd160 hash function.
+    /// The Ripemd160 hash function.
     fn ripemd160(message: &[u8]) -> [u8; 20];
 
     /// BLAKE2b-512 hash function.
@@ -33,7 +33,7 @@ pub mod host_functions_impl {
     use blake2::{Blake2b512, Blake2s256};
     use ripemd::Ripemd160;
     use sha2::{Digest, Sha256, Sha512, Sha512_256};
-    use sha3::Sha3_512;
+    use sha3::Keccak256;
 
     pub struct HostFunctionsManager;
     impl HostFunctionsProvider for HostFunctionsManager {
@@ -58,9 +58,9 @@ pub mod host_functions_impl {
             buf
         }
 
-        fn sha3_512(message: &[u8]) -> [u8; 64] {
-            let digest = Sha3_512::digest(message);
-            let mut buf = [0u8; 64];
+        fn keccak_256(message: &[u8]) -> [u8; 32] {
+            let digest = Keccak256::digest(message);
+            let mut buf = [0u8; 32];
             buf.copy_from_slice(&digest);
             buf
         }