Skip to content

Commit 86c53c2

Browse files
committed
fix: error message.
1 parent ad6991b commit 86c53c2

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

aptos-move/aptos-vm/src/aptos_vm.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2345,6 +2345,11 @@ impl AptosVM {
23452345
// The known Move function failure and type resolution failure could be a result of speculative execution. Use speculative logger.
23462346
StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION
23472347
| StatusCode::TYPE_RESOLUTION_FAILURE => {
2348+
println!(
2349+
"[aptos_vm] Transaction breaking known Move function failure. txn: {:?}, status: {:?}",
2350+
bcs::to_bytes::<SignedTransaction>(txn),
2351+
vm_status,
2352+
);
23482353
speculative_error!(
23492354
log_context,
23502355
format!(

aptos-move/aptos-vm/src/errors.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ pub fn convert_prologue_error(
9797
let err_msg = format!("[aptos_vm] Unexpected prologue Move abort: {:?}::{:?} (Category: {:?} Reason: {:?})",
9898
location, code, category, reason);
9999
speculative_error!(log_context, err_msg.clone());
100+
println!("Error: {:?}", err_msg);
100101
return Err(VMStatus::error(
101102
StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION,
102103
Some(err_msg),
@@ -138,6 +139,7 @@ pub fn convert_prologue_error(
138139
let err_msg = format!("[aptos_vm] Unexpected prologue Move abort: {:?}::{:?} (Category: {:?} Reason: {:?})",
139140
location, code, category, reason);
140141
speculative_error!(log_context, err_msg.clone());
142+
println!("Error: {:?}", err_msg);
141143
return Err(VMStatus::Error {
142144
status_code: StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION,
143145
sub_status: None,
@@ -152,10 +154,11 @@ pub fn convert_prologue_error(
152154
log_context,
153155
format!("[aptos_vm] Unexpected prologue error: {:?}", status),
154156
);
157+
println!("Error: {:?}", status);
155158
VMStatus::Error {
156159
status_code: StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION,
157160
sub_status: status.sub_status(),
158-
message: None,
161+
message: Some(format!("{:?}", status)),
159162
}
160163
},
161164
})
@@ -178,6 +181,7 @@ pub fn convert_epilogue_error(
178181
let err_msg = format!("[aptos_vm] Unexpected success epilogue Move abort: {:?}::{:?} (Category: {:?} Reason: {:?})",
179182
location, code, category, reason);
180183
speculative_error!(log_context, err_msg.clone());
184+
print!("Error: {:?}", err_msg);
181185
VMStatus::error(
182186
StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION,
183187
Some(err_msg),
@@ -190,6 +194,7 @@ pub fn convert_epilogue_error(
190194
let err_msg = format!("[aptos_vm] Unexpected success epilogue Move abort: {:?}::{:?} (Category: {:?} Reason: {:?})",
191195
location, code, category, reason);
192196
speculative_error!(log_context, err_msg.clone());
197+
println!("Error: {:?}", err_msg);
193198
VMStatus::error(
194199
StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION,
195200
Some(err_msg),
@@ -199,6 +204,7 @@ pub fn convert_epilogue_error(
199204
status => {
200205
let err_msg = format!("[aptos_vm] Unexpected success epilogue error: {:?}", status);
201206
speculative_error!(log_context, err_msg.clone());
207+
println!("Error: {:?}", err_msg);
202208
VMStatus::Error {
203209
status_code: StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION,
204210
sub_status: status.sub_status(),
@@ -234,6 +240,7 @@ pub fn expect_only_successful_execution(
234240
function_name, status
235241
);
236242
speculative_warn!(log_context, err_msg.clone());
243+
println!("Error: {:?}", err_msg);
237244
VMStatus::Error {
238245
status_code: StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION,
239246
sub_status: status.sub_status(),

aptos-move/vm-genesis/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,15 +285,14 @@ pub fn encode_genesis_change_set(
285285
initialize_keyless_accounts(&mut session, chain_id);
286286

287287
// initialize governed gas pool only if feature is enabled
288-
/*match &genesis_config.initial_features_override {
288+
match &genesis_config.initial_features_override {
289289
Some(features) => {
290290
if features.is_enabled(FeatureFlag::GOVERNED_GAS_POOL) {
291291
initialize_governed_gas_pool(&mut session);
292292
}
293293
},
294294
None => {},
295-
}*/
296-
initialize_governed_gas_pool(&mut session);
295+
}
297296

298297
set_genesis_end(&mut session);
299298

0 commit comments

Comments
 (0)