Update colors

zemse · Aug 8, 2023 · 1696e1b · 1696e1b
1 parent abd65cb
commit 1696e1b
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 44 deletions.
diff --git a/src/opcodes/mload.ts b/src/opcodes/mload.ts
@@ -1,21 +1,15 @@
 import { InterpreterStep } from "@nomicfoundation/ethereumjs-evm";
 
 import { AwaitedItem, Item } from "../types";
-import {
-  colorKey,
-  colorLabel,
-  colorValue,
-  parseBytes32,
-  parseHex,
-} from "../utils";
+import { colorLabel, colorMload, colorValue, parseBytes32 } from "../utils";
 
 export interface MLOAD {
   offset: string;
   value: string;
 }
 
 function parse(step: InterpreterStep): AwaitedItem<MLOAD> {
-  const offset = parseHex(step.stack[step.stack.length - 1].toString(16), 4);
+  const offset = parseBytes32(step.stack[step.stack.length - 1].toString(16));
 
   const next = 1; // get stack just after this opcode
   return {
@@ -37,7 +31,7 @@ function parse(step: InterpreterStep): AwaitedItem<MLOAD> {
 }
 
 function format(item: Item<MLOAD>): string {
-  return `${colorLabel("[MLOAD]")}  ${colorKey(
+  return `${colorLabel("[MLOAD]")}  ${colorMload(
     item.params.offset
   )} → ${colorValue(item.params.value)}`;
 }

diff --git a/src/opcodes/msize.ts b/src/opcodes/msize.ts
@@ -1,13 +1,7 @@
 import { InterpreterStep } from "@nomicfoundation/ethereumjs-evm";
 
 import { AwaitedItem, Item } from "../types";
-import {
-  colorKey,
-  colorLabel,
-  colorValue,
-  parseBytes32,
-  parseHex,
-} from "../utils";
+import { colorLabel, colorValue, parseBytes32 } from "../utils";
 
 export interface MSIZE {
   size: string;
@@ -21,9 +15,8 @@ function parse(): AwaitedItem<MSIZE> {
     parse: (stepNext: InterpreterStep) => ({
       opcode: "MSIZE",
       params: {
-        size: parseHex(
-          stepNext.stack[stepNext.stack.length - 1].toString(16),
-          4
+        size: parseBytes32(
+          stepNext.stack[stepNext.stack.length - 1].toString(16)
         ),
       },
       format(): string {

diff --git a/src/opcodes/mstore.ts b/src/opcodes/mstore.ts
@@ -2,11 +2,10 @@ import { InterpreterStep } from "@nomicfoundation/ethereumjs-evm";
 
 import { Item } from "../types";
 import {
-  colorKey,
   colorLabel,
+  colorMstore,
   colorValue,
   parseBytes32,
-  parseHex,
   shallowCopyStack2,
 } from "../utils";
 
@@ -21,7 +20,7 @@ function parse(step: InterpreterStep): Item<MSTORE> {
     throw new Error("[hardhat-tracer]: Faulty MSTORE");
   }
 
-  const offset = parseHex(stack.pop()!, 4);
+  const offset = parseBytes32(stack.pop()!);
   const value = parseBytes32(stack.pop()!);
 
   return {
@@ -34,7 +33,7 @@ function parse(step: InterpreterStep): Item<MSTORE> {
 }
 
 function format(item: Item<MSTORE>): string {
-  return `${colorLabel("[MSTORE]")} ${colorKey(
+  return `${colorLabel("[MSTORE]")} ${colorMstore(
     item.params.offset
   )} ← ${colorValue(item.params.value)}`;
 }

diff --git a/src/opcodes/mstore8.ts b/src/opcodes/mstore8.ts
@@ -2,11 +2,10 @@ import { InterpreterStep } from "@nomicfoundation/ethereumjs-evm";
 
 import { Item } from "../types";
 import {
-  colorKey,
   colorLabel,
+  colorMstore,
   colorValue,
   parseBytes32,
-  parseHex,
   shallowCopyStack2,
 } from "../utils";
 
@@ -21,8 +20,8 @@ function parse(step: InterpreterStep): Item<MSTORE8> {
     throw new Error("[hardhat-tracer]: Faulty MSTORE");
   }
 
-  const offset = parseHex(stack.pop()!, 4);
-  const value = parseHex(stack.pop()!, 1);
+  const offset = parseBytes32(stack.pop()!);
+  const value = parseBytes32(stack.pop()!);
 
   return {
     opcode: "MSTORE8",
@@ -34,7 +33,7 @@ function parse(step: InterpreterStep): Item<MSTORE8> {
 }
 
 function format(item: Item<MSTORE8>): string {
-  return `${colorLabel("[MSTORE8]")} ${colorKey(
+  return `${colorLabel("[MSTORE8]")} ${colorMstore(
     item.params.offset
   )} ← ${colorValue(item.params.value)}`;
 }

diff --git a/src/opcodes/sload.ts b/src/opcodes/sload.ts
@@ -1,7 +1,7 @@
 import { InterpreterStep } from "@nomicfoundation/ethereumjs-evm";
 
 import { AwaitedItem, Item } from "../types";
-import { colorKey, colorLabel, colorValue, parseBytes32 } from "../utils";
+import { colorLabel, colorSload, colorValue, parseBytes32 } from "../utils";
 
 export interface SLOAD {
   key: string;
@@ -31,9 +31,9 @@ function parse(step: InterpreterStep): AwaitedItem<SLOAD> {
 }
 
 function format(item: Item<SLOAD>): string {
-  return `${colorLabel("[SLOAD]")}  ${colorKey(item.params.key)} → ${colorValue(
-    item.params.value
-  )}`;
+  return `${colorLabel("[SLOAD]")}  ${colorSload(
+    item.params.key
+  )} → ${colorValue(item.params.value)}`;
 }
 
 export default { parse, format };
diff --git a/src/opcodes/sstore.ts b/src/opcodes/sstore.ts
@@ -1,7 +1,7 @@
 import { InterpreterStep } from "@nomicfoundation/ethereumjs-evm";
 
 import { Item } from "../types";
-import { colorKey, colorLabel, colorValue, parseBytes32 } from "../utils";
+import { colorLabel, colorSstore, colorValue, parseBytes32 } from "../utils";
 
 export interface SSTORE {
   key: string;
@@ -22,9 +22,9 @@ function parse(step: InterpreterStep): Item<SSTORE> {
 }
 
 function format(item: Item<SSTORE>): string {
-  return `${colorLabel("[SSTORE]")} ${colorKey(item.params.key)} ← ${colorValue(
-    item.params.value
-  )}`;
+  return `${colorLabel("[SSTORE]")} ${colorSstore(
+    item.params.key
+  )} ← ${colorValue(item.params.value)}`;
 }
 
 export default { parse, format };
diff --git a/src/utils/colors.ts b/src/utils/colors.ts
@@ -14,6 +14,8 @@ export const colorValue = chalk.whiteBright;
 export const colorExtra = chalk.gray;
 export const colorSload = chalk.blueBright;
 export const colorSstore = chalk.redBright;
+export const colorMload = chalk.blueBright;
+export const colorMstore = chalk.redBright;
 export const colorNameTag = chalk.italic;
 export const colorIndexed = chalk.italic;
 

diff --git a/src/utils/hex.ts b/src/utils/hex.ts
@@ -25,14 +25,6 @@ export function parseBytes32(str: string) {
   return hexZeroPad(hexStripZeros(hexPrefix(str)), 32);
 }
 
-export function parseHex(str: string, bytes?: number) {
-  let val = hexStripZeros(hexPrefix(str));
-  if (bytes && val.length - 2 < bytes * 2) {
-    val = hexZeroPad(val, bytes);
-  }
-  return val;
-}
-
 export function parseMemory(strArr: string[]) {
   return arrayify(hexPrefix(strArr.join("")));
 }

diff --git a/test/fixture-projects/hardhat-project/contracts/Hello.sol b/test/fixture-projects/hardhat-project/contracts/Hello.sol
@@ -110,10 +110,15 @@ contract Hello {
   }
 
   function firstCall() public returns (uint256) {
+    assembly {
+      let val := sload(1)
+      sstore(0, add(val, 1))
+    }
     (, bytes memory ret) = address(this).staticcall(
       abi.encodeCall(this.secondStaticCall, ())
     );
     assembly {
+      sstore(0, 1)
       return(add(32, ret), mload(ret))
     }
   }