[sui-json-rpc] Use more efficient parser

crates/sui-json-rpc-types/src/lib.rs

@@ -19,14 +19,14 @@ use move_binary_format::normalized::{
 use move_bytecode_utils::module_cache::GetModule;
 use move_core_types::identifier::Identifier;
 use move_core_types::language_storage::{StructTag, TypeTag};
-use move_core_types::parser::{parse_struct_tag, parse_type_tag};
 use move_core_types::value::{MoveStruct, MoveStructLayout, MoveValue};
 use schemars::JsonSchema;
 use serde::ser::Error;
 use serde::Deserialize;
 use serde::Serialize;
 use serde_json::Value;
 use serde_with::serde_as;
+use sui_types::{parse_sui_struct_tag, parse_sui_type_tag};
 use tracing::warn;
 
 use sui_json::SuiJsonValue;
@@ -477,7 +477,7 @@ impl TryInto<Object> for SuiObject<SuiRawData> {
     fn try_into(self) -> Result<Object, Self::Error> {
         let data = match self.data {
             SuiRawData::MoveObject(o) => {
-                let struct_tag = parse_struct_tag(o.type_())?;
+                let struct_tag = parse_sui_struct_tag(o.type_())?;
                 Data::Move(unsafe {
                     MoveObject::new_from_execution(
                         struct_tag,
@@ -2091,7 +2091,7 @@ pub struct SuiTypeTag(String);
 impl TryInto<TypeTag> for SuiTypeTag {
     type Error = anyhow::Error;
     fn try_into(self) -> Result<TypeTag, Self::Error> {
-        parse_type_tag(&self.0)
+        parse_sui_type_tag(&self.0)
     }
 }
 
@@ -2155,8 +2155,8 @@ impl TryInto<EventFilter> for SuiEventFilter {
             Package(id) => EventFilter::Package(id),
             Module(module) => EventFilter::Module(Identifier::new(module)?),
             MoveEventType(event_type) => {
-                // parse_struct_tag converts StructTag string e.g. `0x2::devnet_nft::MintNFTEvent` to StructTag object
-                EventFilter::MoveEventType(parse_struct_tag(&event_type)?)
+                // parse_sui_struct_tag converts StructTag string e.g. `0x2::devnet_nft::MintNFTEvent` to StructTag object
+                EventFilter::MoveEventType(parse_sui_struct_tag(&event_type)?)
             }
             MoveEventField { path, value } => EventFilter::MoveEventField { path, value },
             SenderAddress(address) => EventFilter::SenderAddress(address),

crates/sui-types/Cargo.toml

@@ -43,6 +43,7 @@ typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090
 
 move-binary-format = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
 move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
+move-command-line-common = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
 move-core-types = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2", features = ["address20"] }
 move-disassembler = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
 move-ir-types = { git = "https://github.com/move-language/move", rev = "70b34a66473c34ad30d101290b249f2db3c847a2" }
@@ -57,4 +58,3 @@ workspace-hack = { path = "../workspace-hack"}
 
 [dev-dependencies]
 bincode = "1.3.3"
-

crates/sui-types/src/lib.rs

@@ -8,7 +8,10 @@
 )]
 
 use base_types::ObjectID;
-use move_core_types::account_address::AccountAddress;
+use move_core_types::{
+    account_address::AccountAddress,
+    language_storage::{StructTag, TypeTag},
+};
 
 #[macro_use]
 pub mod error;
@@ -59,3 +62,21 @@ const fn get_hex_address_two() -> AccountAddress {
 pub fn sui_framework_address_concat_string(suffix: &str) -> String {
     format!("{}{suffix}", SUI_FRAMEWORK_ADDRESS.to_hex_literal())
 }
+
+pub fn parse_sui_struct_tag(s: &str) -> anyhow::Result<StructTag> {
+    use move_command_line_common::types::ParsedStructType;
+    ParsedStructType::parse(s)?.into_struct_tag(&resolve_address)
+}
+
+pub fn parse_sui_type_tag(s: &str) -> anyhow::Result<TypeTag> {
+    use move_command_line_common::types::ParsedType;
+    ParsedType::parse(s)?.into_type_tag(&resolve_address)
+}
+
+fn resolve_address(addr: &str) -> Option<AccountAddress> {
+    match addr {
+        "std" => Some(MOVE_STDLIB_ADDRESS),
+        "sui" => Some(SUI_FRAMEWORK_ADDRESS),
+        _ => None,
+    }
+}

crates/sui/src/client_commands.rs

@@ -12,7 +12,7 @@ use std::{
 use anyhow::anyhow;
 use clap::*;
 use colored::Colorize;
-use move_core_types::{language_storage::TypeTag, parser::parse_type_tag};
+use move_core_types::language_storage::TypeTag;
 use move_package::BuildConfig;
 use serde::Serialize;
 use serde_json::json;
@@ -33,7 +33,7 @@ use sui_types::{
     messages::ExecuteTransactionRequestType,
     messages::Transaction,
     object::Owner,
-    SUI_FRAMEWORK_ADDRESS,
+    parse_sui_type_tag, SUI_FRAMEWORK_ADDRESS,
 };
 use tracing::info;
 
@@ -117,7 +117,7 @@ pub enum SuiClientCommands {
         /// Function name in module
         #[clap(
         long,
-        parse(try_from_str = parse_type_tag),
+        parse(try_from_str = parse_sui_type_tag),
         multiple_occurrences = false,
         multiple_values = true
         )]