@@ -3,7 +3,6 @@ use blockifier::execution::call_info::CallInfo;
3
3
use blockifier:: execution:: contract_class:: TrackedResource ;
4
4
use blockifier:: execution:: entry_point:: {
5
5
CallEntryPoint , CallType , EntryPointExecutionContext , EntryPointExecutionResult ,
6
- ExecutableCallEntryPoint ,
7
6
} ;
8
7
use blockifier:: execution:: execution_utils:: ReadOnlySegments ;
9
8
use blockifier:: execution:: syscalls:: hint_processor:: SyscallHintProcessor ;
@@ -45,22 +44,13 @@ pub mod cache;
45
44
pub mod state;
46
45
47
46
fn build_syscall_hint_processor < ' a > (
48
- call_entry_point : CallEntryPoint ,
47
+ call_entry_point : & CallEntryPoint ,
49
48
state : & ' a mut dyn State ,
50
49
entry_point_execution_context : & ' a mut EntryPointExecutionContext ,
51
50
hints : & ' a HashMap < String , Hint > ,
52
51
) -> SyscallHintProcessor < ' a > {
53
- let call_entry_point = ExecutableCallEntryPoint {
54
- class_hash : call_entry_point. class_hash . unwrap_or_default ( ) ,
55
- code_address : call_entry_point. code_address ,
56
- entry_point_type : call_entry_point. entry_point_type ,
57
- entry_point_selector : call_entry_point. entry_point_selector ,
58
- calldata : call_entry_point. calldata ,
59
- storage_address : call_entry_point. storage_address ,
60
- caller_address : call_entry_point. caller_address ,
61
- call_type : call_entry_point. call_type ,
62
- initial_gas : call_entry_point. initial_gas ,
63
- } ;
52
+ let class_hash = call_entry_point. class_hash . unwrap_or_default ( ) ;
53
+ let call_entry_point = call_entry_point. clone ( ) . into_executable ( class_hash) ;
64
54
65
55
SyscallHintProcessor :: new (
66
56
state,
@@ -120,7 +110,7 @@ pub fn deploy_contract(
120
110
let hints = HashMap :: new ( ) ;
121
111
122
112
let mut syscall_hint_processor = build_syscall_hint_processor (
123
- CallEntryPoint :: default ( ) ,
113
+ & CallEntryPoint :: default ( ) ,
124
114
state,
125
115
& mut entry_point_execution_context,
126
116
& hints,
@@ -151,7 +141,7 @@ pub fn deploy_wrapper(
151
141
let hints = HashMap :: new ( ) ;
152
142
153
143
let mut syscall_hint_processor = build_syscall_hint_processor (
154
- CallEntryPoint :: default ( ) ,
144
+ & CallEntryPoint :: default ( ) ,
155
145
state,
156
146
& mut entry_point_execution_context,
157
147
& hints,
@@ -182,7 +172,7 @@ pub fn deploy_at_wrapper(
182
172
let hints = HashMap :: new ( ) ;
183
173
184
174
let mut syscall_hint_processor = build_syscall_hint_processor (
185
- CallEntryPoint :: default ( ) ,
175
+ & CallEntryPoint :: default ( ) ,
186
176
state,
187
177
& mut entry_point_execution_context,
188
178
& hints,
@@ -230,7 +220,7 @@ pub fn call_contract(
230
220
let hints = HashMap :: new ( ) ;
231
221
232
222
let mut syscall_hint_processor = build_syscall_hint_processor (
233
- entry_point. clone ( ) ,
223
+ & entry_point,
234
224
state,
235
225
& mut entry_point_execution_context,
236
226
& hints,
@@ -271,7 +261,7 @@ pub fn call_contract_raw(
271
261
let hints = HashMap :: new ( ) ;
272
262
273
263
let syscall_hint_processor = build_syscall_hint_processor (
274
- entry_point. clone ( ) ,
264
+ & entry_point,
275
265
state,
276
266
& mut entry_point_execution_context,
277
267
& hints,
0 commit comments