@@ -47,66 +47,13 @@ import {
47
47
Uint256Ty ,
48
48
CONSOLE_LOG_SIGNATURES ,
49
49
} from "./logger" ;
50
- import {
51
- EvmMessageTrace ,
52
- isCallTrace ,
53
- isEvmStep ,
54
- isPrecompileTrace ,
55
- MessageTrace ,
56
- } from "./message-trace" ;
57
50
58
- const CONSOLE_ADDRESS = "0x000000000000000000636F6e736F6c652e6c6f67" ; // toHex("console.log")
59
51
const REGISTER_SIZE = 32 ;
60
52
61
- // eslint-disable-next-line @typescript-eslint/no-empty-interface
62
- interface ConsoleLogArray extends Array < ConsoleLogEntry > { }
63
-
64
- export type ConsoleLogEntry = string | ConsoleLogArray ;
65
-
66
- // eslint-disable-next-line @typescript-eslint/no-redeclare
53
+ export type ConsoleLogEntry = string | ConsoleLogEntry [ ] ;
67
54
export type ConsoleLogs = ConsoleLogEntry [ ] ;
68
55
69
56
export class ConsoleLogger {
70
- public getLogMessages ( maybeDecodedMessageTrace : MessageTrace ) : string [ ] {
71
- return this . getExecutionLogs ( maybeDecodedMessageTrace ) . map (
72
- consoleLogToString
73
- ) ;
74
- }
75
-
76
- public getExecutionLogs (
77
- maybeDecodedMessageTrace : MessageTrace
78
- ) : ConsoleLogs [ ] {
79
- if ( isPrecompileTrace ( maybeDecodedMessageTrace ) ) {
80
- return [ ] ;
81
- }
82
-
83
- const logs : ConsoleLogs [ ] = [ ] ;
84
- this . _collectExecutionLogs ( maybeDecodedMessageTrace , logs ) ;
85
- return logs ;
86
- }
87
-
88
- private _collectExecutionLogs ( trace : EvmMessageTrace , logs : ConsoleLogs ) {
89
- for ( const messageTrace of trace . steps ) {
90
- if ( isEvmStep ( messageTrace ) || isPrecompileTrace ( messageTrace ) ) {
91
- continue ;
92
- }
93
-
94
- if (
95
- isCallTrace ( messageTrace ) &&
96
- bufferToHex ( messageTrace . address ) === CONSOLE_ADDRESS . toLowerCase ( )
97
- ) {
98
- const log = this . _maybeConsoleLog ( Buffer . from ( messageTrace . calldata ) ) ;
99
- if ( log !== undefined ) {
100
- logs . push ( log ) ;
101
- }
102
-
103
- continue ;
104
- }
105
-
106
- this . _collectExecutionLogs ( messageTrace , logs ) ;
107
- }
108
- }
109
-
110
57
/**
111
58
* Temporary code to print console.sol messages that come from EDR
112
59
*/
0 commit comments