From af0cfa63bc47add41f8e7b346dfa9c361571d6d5 Mon Sep 17 00:00:00 2001
From: Timothy Zakian <tim@mystenlabs.com>
Date: Wed, 22 May 2024 17:29:03 -0700
Subject: [PATCH] fixup! [sui-adapter] Resolve Move abort locations to package
 ID instead of runtime ID

---
 crates/sui-open-rpc/spec/openrpc.json         | 3 ++-
 sui-execution/latest/sui-adapter/src/error.rs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/crates/sui-open-rpc/spec/openrpc.json b/crates/sui-open-rpc/spec/openrpc.json
index 49519593b60d49..ba2796c772b009 100644
--- a/crates/sui-open-rpc/spec/openrpc.json
+++ b/crates/sui-open-rpc/spec/openrpc.json
@@ -1359,7 +1359,7 @@
             "name": "Result",
             "value": {
               "minSupportedProtocolVersion": "1",
-              "maxSupportedProtocolVersion": "46",
+              "maxSupportedProtocolVersion": "47",
               "protocolVersion": "6",
               "featureFlags": {
                 "accept_zklogin_in_multisig": false,
@@ -1398,6 +1398,7 @@
                 "recompute_has_public_transfer_in_execution": false,
                 "reject_mutable_random_on_entry_functions": false,
                 "reshare_at_same_initial_version": false,
+                "resolve_abort_locations_to_package_id": false,
                 "scoring_decision_with_validity_cutoff": true,
                 "shared_object_deletion": false,
                 "simple_conservation_checks": false,
diff --git a/sui-execution/latest/sui-adapter/src/error.rs b/sui-execution/latest/sui-adapter/src/error.rs
index 30f233826e95ee..cadd13e2232188 100644
--- a/sui-execution/latest/sui-adapter/src/error.rs
+++ b/sui-execution/latest/sui-adapter/src/error.rs
@@ -32,7 +32,7 @@ pub(crate) fn convert_vm_error<S: MoveResolver<Err = SuiError>>(
         }
         (StatusCode::ABORTED, Some(code), Location::Module(id)) => {
             let abort_location_id = if resolve_abort_location_to_package_id {
-                state_view.relocate(id).unwrap_or(id.clone())
+                state_view.relocate(id).unwrap_or_else(|_| id.clone())
             } else {
                 id.clone()
             };