Merge pull request #590 from ethereum/rename_sha3_to_keccak256

Rename instruction SHA3 -> KECCAK256
ethereum · Apr 26, 2021 · a740dfb · a740dfb
2 parents a1130d6 + 2ba8647
commit a740dfb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning].
   `access_account()` and `access_storage()` functions added to `evmc_host_interface`.
   [#571](https://github.com/ethereum/evmc/pull/571)
 
+### Changed
+
+- Instruction `SHA3` has been renamed to `KECCAK256` as proposed by 
+  [EIP-1803](https://eips.ethereum.org/EIPS/eip-1803) to better match the underlying hash function.
+  [#590](https://github.com/ethereum/evmc/pull/590)
+
 ## [7.5.0] — 2021-03-23
 
 ### Added

diff --git a/include/evmc/instructions.h b/include/evmc/instructions.h
@@ -53,7 +53,7 @@ enum evmc_opcode
     OP_SHR = 0x1c,
     OP_SAR = 0x1d,
 
-    OP_SHA3 = 0x20,
+    OP_KECCAK256 = 0x20,
 
     OP_ADDRESS = 0x30,
     OP_BALANCE = 0x31,

diff --git a/lib/instructions/instruction_metrics.c b/lib/instructions/instruction_metrics.c
@@ -64,7 +64,7 @@ static struct evmc_instruction_metrics berlin_metrics[256] = {
     /*            SAR = 0x1d */ {VERYLOW, 2, -1},
     /*                = 0x1e */ {UNDEFINED, 0, 0},
     /*                = 0x1f */ {UNDEFINED, 0, 0},
-    /*           SHA3 = 0x20 */ {30, 2, -1},
+    /*      KECCAK256 = 0x20 */ {30, 2, -1},
     /*                = 0x21 */ {UNDEFINED, 0, 0},
     /*                = 0x22 */ {UNDEFINED, 0, 0},
     /*                = 0x23 */ {UNDEFINED, 0, 0},
@@ -323,7 +323,7 @@ static struct evmc_instruction_metrics istanbul_metrics[256] = {
     /*            SAR = 0x1d */ {VERYLOW, 2, -1},
     /*                = 0x1e */ {UNDEFINED, 0, 0},
     /*                = 0x1f */ {UNDEFINED, 0, 0},
-    /*           SHA3 = 0x20 */ {30, 2, -1},
+    /*      KECCAK256 = 0x20 */ {30, 2, -1},
     /*                = 0x21 */ {UNDEFINED, 0, 0},
     /*                = 0x22 */ {UNDEFINED, 0, 0},
     /*                = 0x23 */ {UNDEFINED, 0, 0},
@@ -582,7 +582,7 @@ static struct evmc_instruction_metrics constantinople_metrics[256] = {
     /*            SAR = 0x1d */ {VERYLOW, 2, -1},
     /*                = 0x1e */ {UNDEFINED, 0, 0},
     /*                = 0x1f */ {UNDEFINED, 0, 0},
-    /*           SHA3 = 0x20 */ {30, 2, -1},
+    /*      KECCAK256 = 0x20 */ {30, 2, -1},
     /*                = 0x21 */ {UNDEFINED, 0, 0},
     /*                = 0x22 */ {UNDEFINED, 0, 0},
     /*                = 0x23 */ {UNDEFINED, 0, 0},
@@ -841,7 +841,7 @@ static struct evmc_instruction_metrics byzantium_metrics[256] = {
     /*                = 0x1d */ {UNDEFINED, 0, 0},
     /*                = 0x1e */ {UNDEFINED, 0, 0},
     /*                = 0x1f */ {UNDEFINED, 0, 0},
-    /*           SHA3 = 0x20 */ {30, 2, -1},
+    /*      KECCAK256 = 0x20 */ {30, 2, -1},
     /*                = 0x21 */ {UNDEFINED, 0, 0},
     /*                = 0x22 */ {UNDEFINED, 0, 0},
     /*                = 0x23 */ {UNDEFINED, 0, 0},
@@ -1100,7 +1100,7 @@ static struct evmc_instruction_metrics tangerine_whistle_metrics[256] = {
     /*                = 0x1d */ {UNDEFINED, 0, 0},
     /*                = 0x1e */ {UNDEFINED, 0, 0},
     /*                = 0x1f */ {UNDEFINED, 0, 0},
-    /*           SHA3 = 0x20 */ {30, 2, -1},
+    /*      KECCAK256 = 0x20 */ {30, 2, -1},
     /*                = 0x21 */ {UNDEFINED, 0, 0},
     /*                = 0x22 */ {UNDEFINED, 0, 0},
     /*                = 0x23 */ {UNDEFINED, 0, 0},
@@ -1359,7 +1359,7 @@ static struct evmc_instruction_metrics homestead_metrics[256] = {
     /*                = 0x1d */ {UNDEFINED, 0, 0},
     /*                = 0x1e */ {UNDEFINED, 0, 0},
     /*                = 0x1f */ {UNDEFINED, 0, 0},
-    /*           SHA3 = 0x20 */ {30, 2, -1},
+    /*      KECCAK256 = 0x20 */ {30, 2, -1},
     /*                = 0x21 */ {UNDEFINED, 0, 0},
     /*                = 0x22 */ {UNDEFINED, 0, 0},
     /*                = 0x23 */ {UNDEFINED, 0, 0},
@@ -1618,7 +1618,7 @@ static struct evmc_instruction_metrics frontier_metrics[256] = {
     /*                = 0x1d */ {UNDEFINED, 0, 0},
     /*                = 0x1e */ {UNDEFINED, 0, 0},
     /*                = 0x1f */ {UNDEFINED, 0, 0},
-    /*           SHA3 = 0x20 */ {30, 2, -1},
+    /*      KECCAK256 = 0x20 */ {30, 2, -1},
     /*                = 0x21 */ {UNDEFINED, 0, 0},
     /*                = 0x22 */ {UNDEFINED, 0, 0},
     /*                = 0x23 */ {UNDEFINED, 0, 0},

diff --git a/lib/instructions/instruction_names.c b/lib/instructions/instruction_names.c
@@ -38,7 +38,7 @@ static const char* istanbul_names[256] = {
     /* 0x1d */ "SAR",
     /* 0x1e */ NULL,
     /* 0x1f */ NULL,
-    /* 0x20 */ "SHA3",
+    /* 0x20 */ "KECCAK256",
     /* 0x21 */ NULL,
     /* 0x22 */ NULL,
     /* 0x23 */ NULL,
@@ -297,7 +297,7 @@ static const char* constantinople_names[256] = {
     /* 0x1d */ "SAR",
     /* 0x1e */ NULL,
     /* 0x1f */ NULL,
-    /* 0x20 */ "SHA3",
+    /* 0x20 */ "KECCAK256",
     /* 0x21 */ NULL,
     /* 0x22 */ NULL,
     /* 0x23 */ NULL,
@@ -556,7 +556,7 @@ static const char* byzantium_names[256] = {
     /* 0x1d */ NULL,
     /* 0x1e */ NULL,
     /* 0x1f */ NULL,
-    /* 0x20 */ "SHA3",
+    /* 0x20 */ "KECCAK256",
     /* 0x21 */ NULL,
     /* 0x22 */ NULL,
     /* 0x23 */ NULL,
@@ -815,7 +815,7 @@ static const char* homestead_names[256] = {
     /* 0x1d */ NULL,
     /* 0x1e */ NULL,
     /* 0x1f */ NULL,
-    /* 0x20 */ "SHA3",
+    /* 0x20 */ "KECCAK256",
     /* 0x21 */ NULL,
     /* 0x22 */ NULL,
     /* 0x23 */ NULL,
@@ -1074,7 +1074,7 @@ static const char* frontier_names[256] = {
     /* 0x1d */ NULL,
     /* 0x1e */ NULL,
     /* 0x1f */ NULL,
-    /* 0x20 */ "SHA3",
+    /* 0x20 */ "KECCAK256",
     /* 0x21 */ NULL,
     /* 0x22 */ NULL,
     /* 0x23 */ NULL,