Map MoveCall package IDs for transactions

Add tracking and mapping of MoveCall package IDs to improve identification of smart-contract targets for programmable transactions. Introduces move_call_packages on Digest, decodes MoveCall commands and Transaction.kind in proto handlers, and extracts package IDs in the RPC mapper. Transaction mapping now prefers a primary non-framework contract from move_call_packages (falling back to event packages) and includes tests plus testdata for a Mayan MCTP flow. Also updates RPC client read mask and adds SUI_MCTP_PACKAGE_ID to Mayan constants.

Author: gemcoder21

crates/gem_sui/src/models/transaction.rs

@@ -87,6 +87,8 @@ pub struct Checkpoint {
 pub struct Digest {
     pub digest: String,
     pub effects: Effect,
+    #[serde(default)]
+    pub move_call_packages: Vec<String>,
     #[serde(rename = "balanceChanges")]
     pub balance_changes: Option<Vec<BalanceChange>>,
     pub events: Vec<Event>,

crates/gem_sui/src/provider/transaction_state_mapper.rs

@@ -33,6 +33,7 @@ mod tests {
                     owner: Owner::String("0x123".to_string()),
                 },
             },
+            move_call_packages: Vec::new(),
             balance_changes: None,
             events: vec![],
             timestamp_ms: 1234567890,

crates/gem_sui/src/provider/transactions_mapper.rs

@@ -1,5 +1,5 @@
 use crate::models::{BalanceChange, Digest, Event, EventStake, EventUnstake, GasUsed, TransactionBlocks};
-use crate::{SUI_COIN_TYPE, SUI_STAKE_EVENT, SUI_UNSTAKE_EVENT, full_coin_type};
+use crate::{SUI_COIN_TYPE, SUI_STAKE_EVENT, SUI_UNSTAKE_EVENT, full_coin_type, sui_framework_package_address};
 use chain_primitives::{BalanceDiff, SwapMapper};
 use chrono::{TimeZone, Utc};
 use num_bigint::{BigUint, Sign};
@@ -33,7 +33,7 @@ pub fn map_transaction(transaction: Digest) -> Option<Transaction> {
     };
     let owner = effects.gas_object.owner.get_address_owner();
 
-    let (asset_id, from, to, transaction_type, value, metadata) = map_transaction_type(&transaction.events, &balance_changes, &owner, &fee)?;
+    let (asset_id, from, to, transaction_type, value, metadata) = map_transaction_type(&transaction.events, &transaction.move_call_packages, &balance_changes, &owner, &fee)?;
 
     Some(Transaction::new(
         hash,
@@ -54,6 +54,7 @@ pub fn map_transaction(transaction: Digest) -> Option<Transaction> {
 
 fn map_transaction_type(
     events: &[Event],
+    move_call_packages: &[String],
     balance_changes: &[BalanceChange],
     owner: &Option<String>,
     fee: &BigUint,
@@ -135,10 +136,11 @@ fn map_transaction_type(
         let method_name = events.first()?.event_type.rsplit("::").nth(1)?.to_string();
         let metadata = TransactionSmartContractMetadata { method_name };
         let owner = owner.clone()?;
+        let contract = primary_contract(move_call_packages.iter().map(String::as_str)).or_else(|| primary_contract(events.iter().map(|event| event.package_id.as_str())));
         return Some((
             chain.as_asset_id(),
             owner.clone(),
-            owner,
+            contract.unwrap_or(owner),
             TransactionType::SmartContractCall,
             "0".to_string(),
             serde_json::to_value(metadata).ok(),
@@ -148,6 +150,26 @@ fn map_transaction_type(
     None
 }
 
+fn primary_contract<'a>(contracts: impl IntoIterator<Item = &'a str>) -> Option<String> {
+    let mut first = None;
+    for contract in contracts {
+        if contract.is_empty() {
+            continue;
+        }
+        if first.is_none() {
+            first = Some(contract);
+        }
+        if !is_sui_framework_package(contract) {
+            return Some(contract.to_string());
+        }
+    }
+    first.map(ToString::to_string)
+}
+
+fn is_sui_framework_package(package: &str) -> bool {
+    package.parse::<sui_types::Address>().is_ok_and(|address| address == sui_framework_package_address())
+}
+
 fn map_transfer_balance_changes<'a>(balance_changes: &'a [BalanceChange], fee: &BigUint) -> Option<(&'a BalanceChange, &'a BalanceChange)> {
     let to_change = single(balance_changes.iter().filter(|change| change.amount.sign() == Sign::Plus))?;
     let from_change = single(outgoing_changes(balance_changes, &to_change.coin_type)).or_else(|| select_native_transfer_source(balance_changes, to_change, fee))?;
@@ -273,6 +295,7 @@ mod tests {
                 status: Status { status: "success".to_string() },
                 gas_object: GasObject { owner: owner(OWNER_ADDRESS) },
             },
+            move_call_packages: Vec::new(),
             balance_changes: Some(balance_changes),
             events,
             timestamp_ms: 1778964551487,
@@ -298,6 +321,18 @@ mod tests {
         assert_eq!(metadata.method_name, "timevy_tipping");
     }
 
+    #[test]
+    fn test_map_mayan_mctp_smart_contract_call() {
+        let digest: Digest = serde_json::from_str(include_str!("../../testdata/mayan_mctp_sui_usdc_to_arbitrum_usdc.json")).unwrap();
+        let expected_contract = primary_contract(digest.move_call_packages.iter().map(String::as_str)).unwrap();
+        let transaction = map_transaction(digest).unwrap();
+
+        assert_eq!(transaction.hash, "AqXACRuimqMVf4wiVjR3Ch5PBunhQAJY3ZfAMF3MXUsW");
+        assert_eq!(transaction.transaction_type, TransactionType::SmartContractCall);
+        assert_eq!(transaction.from, "0x1b4cd8b734f2465614678ca0450ce9c4f2ff4835c6a7545522892a1a8fb67991");
+        assert_eq!(transaction.to, expected_contract);
+    }
+
     #[test]
     fn test_map_transaction_by_hash() {
         let digest: Digest = serde_json::from_str(include_str!("../../testdata/transfer_sui.json")).unwrap();

crates/gem_sui/src/rpc/client.rs

@@ -23,6 +23,7 @@ use crate::{SUI_COIN_TYPE, SUI_COIN_TYPE_FULL};
 
 const TRANSACTION_READ_MASK: &[&str] = &[
     "digest",
+    "transaction.kind",
     "effects.gas_used",
     "effects.status",
     "effects.gas_object",

crates/gem_sui/src/rpc/mapper.rs

@@ -2,7 +2,7 @@ use std::{error::Error, str::FromStr};
 
 use num_bigint::{BigInt, BigUint};
 
-use super::proto::{self, OwnerKind, Timestamp};
+use super::proto::{self, Command, OwnerKind, Timestamp};
 use crate::models::transaction::SuiStatus;
 use crate::models::{
     BalanceChange, Checkpoint, Digest, Effect, Event, GasObject, GasUsed, InspectCommandResult, InspectEffects, InspectGasUsed, InspectResult, Owner, OwnerObject, Status,
@@ -37,12 +37,36 @@ pub(super) fn map_executed_transaction(transaction: proto::ExecutedTransaction)
     Ok(Digest {
         digest: transaction.digest.ok_or("missing Sui transaction digest")?,
         effects: map_effect(transaction.effects.as_ref()),
+        move_call_packages: map_move_call_packages(transaction.transaction.as_ref()),
         balance_changes: Some(transaction.balance_changes.into_iter().map(map_balance_change).collect::<Result<Vec<_>, _>>()?),
         events: transaction.events.map(map_events).unwrap_or_default(),
         timestamp_ms: transaction.timestamp.as_ref().map(timestamp_millis).unwrap_or_default() as u64,
     })
 }
 
+fn map_move_call_packages(transaction: Option<&proto::Transaction>) -> Vec<String> {
+    transaction
+        .and_then(|transaction| transaction.kind.as_ref())
+        .and_then(|kind| kind.programmable_transaction.as_ref())
+        .map(|transaction| {
+            transaction
+                .commands
+                .iter()
+                .filter_map(|command| match command {
+                    Command::MoveCall(call) => call.package.clone(),
+                    Command::TransferObjects(_)
+                    | Command::SplitCoins(_)
+                    | Command::MergeCoins(_)
+                    | Command::Publish(_)
+                    | Command::MakeMoveVector(_)
+                    | Command::Upgrade(_)
+                    | Command::Unknown => None,
+                })
+                .collect()
+        })
+        .unwrap_or_default()
+}
+
 fn map_effect(effects: Option<&proto::TransactionEffects>) -> Effect {
     let gas_object_owner = effects
         .and_then(|effects| effects.gas_object.as_ref())

crates/gem_sui/src/rpc/proto/mod.rs

@@ -25,7 +25,7 @@ pub(crate) use objects::{
 pub(crate) use service::{Epoch, GetEpochRequest, GetEpochResponse, GetServiceInfoRequest, GetServiceInfoResponse};
 pub(crate) use status::Status;
 pub(crate) use timestamp::Timestamp;
-pub(crate) use transaction_data::{Argument, Input, MoveCall, ProgrammableTransaction, Transaction, TransactionKind, UserSignature};
+pub(crate) use transaction_data::{Argument, Command, Input, MoveCall, ProgrammableTransaction, Transaction, TransactionKind, UserSignature};
 pub(crate) use transactions::{
     BalanceChange, BatchGetTransactionsRequest, BatchGetTransactionsResponse, ExecuteTransactionRequest, ExecuteTransactionResponse, ExecutedTransaction, GasCostSummary,
     GetTransactionRequest, GetTransactionResponse, GetTransactionResult, SimulateTransactionRequest, SimulateTransactionResponse, TransactionChecks, TransactionEffects,

crates/gem_sui/src/rpc/proto/transaction_data/command.rs

@@ -1,4 +1,4 @@
-use gem_encoding::protobuf::{encode_message_field, proto_encode};
+use gem_encoding::protobuf::{encode_message_field, proto_decode, proto_encode};
 use sui_types as sdk;
 
 use super::Argument;
@@ -7,7 +7,7 @@ use crate::rpc::proto::MessageResult;
 // Field numbers mirror sui-rpc v0.3.1 transaction command schemas:
 // https://docs.rs/crate/sui-rpc/0.3.1/source/vendored/proto/sui/rpc/v2/transaction.proto
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub enum Command {
     MoveCall(MoveCall),
     TransferObjects(TransferObjects),
@@ -16,6 +16,8 @@ pub enum Command {
     Publish(Publish),
     MakeMoveVector(MakeMoveVector),
     Upgrade(Upgrade),
+    #[default]
+    Unknown,
 }
 
 impl Command {
@@ -48,9 +50,14 @@ proto_encode!(Command as value {
         Command::Publish(value) => encode_message_field(5, &value.encode()),
         Command::MakeMoveVector(value) => encode_message_field(6, &value.encode()),
         Command::Upgrade(value) => encode_message_field(7, &value.encode()),
+        Command::Unknown => Vec::new(),
     },
 });
 
+proto_decode!(Command {
+    1 => |value, field| *value = Self::MoveCall(field.message()?),
+});
+
 #[derive(Clone, Debug, Default)]
 pub struct MoveCall {
     pub package: Option<String>,
@@ -90,6 +97,10 @@ proto_encode!(MoveCall {
     5 => arguments: repeated_message,
 });
 
+proto_decode!(MoveCall {
+    1 => package: optional_string,
+});
+
 #[derive(Clone, Debug, Default)]
 pub struct TransferObjects {
     pub objects: Vec<Argument>,

crates/gem_sui/src/rpc/proto/transaction_data/transaction.rs

@@ -1,4 +1,4 @@
-use gem_encoding::protobuf::proto_encode;
+use gem_encoding::protobuf::{proto_decode, proto_encode};
 use sui_types as sdk;
 
 use super::{Command, Input};
@@ -40,6 +40,10 @@ proto_encode!(Transaction {
     5 => sender: optional_string,
 });
 
+proto_decode!(Transaction {
+    4 => kind: optional_message,
+});
+
 #[derive(Clone, Debug, Default)]
 pub struct TransactionKind {
     pub kind: Option<i32>,
@@ -74,6 +78,10 @@ proto_encode!(TransactionKind {
     2 => programmable_transaction: optional_message,
 });
 
+proto_decode!(TransactionKind {
+    2 => programmable_transaction: optional_message,
+});
+
 #[derive(Clone, Debug, Default)]
 pub struct ProgrammableTransaction {
     pub inputs: Vec<Input>,
@@ -93,3 +101,7 @@ proto_encode!(ProgrammableTransaction {
     1 => inputs: repeated_message,
     2 => commands: repeated_message,
 });
+
+proto_decode!(ProgrammableTransaction {
+    2 => commands: repeated_message,
+});

crates/gem_sui/src/rpc/proto/transactions.rs

@@ -154,6 +154,7 @@ proto_decode!(CommandOutput {
 #[derive(Clone, Debug, Default)]
 pub struct ExecutedTransaction {
     pub digest: Option<String>,
+    pub transaction: Option<Transaction>,
     pub effects: Option<TransactionEffects>,
     pub events: Option<TransactionEvents>,
     pub timestamp: Option<Timestamp>,
@@ -162,6 +163,7 @@ pub struct ExecutedTransaction {
 
 proto_decode!(ExecutedTransaction {
     1 => digest: optional_string,
+    2 => transaction: optional_message,
     4 => effects: optional_message,
     5 => events: optional_message,
     7 => timestamp: optional_message,

crates/gem_sui/testdata/mayan_mctp_sui_usdc_to_arbitrum_usdc.json

@@ -0,0 +1,79 @@
+{
+  "digest": "AqXACRuimqMVf4wiVjR3Ch5PBunhQAJY3ZfAMF3MXUsW",
+  "move_call_packages": [
+    "0x0000000000000000000000000000000000000000000000000000000000000002",
+    "0xb5bd3599ec7f4ae86afd84398f6f2d862deecce965e8ace2d8d8c8108d5076df",
+    "0xb5bd3599ec7f4ae86afd84398f6f2d862deecce965e8ace2d8d8c8108d5076df",
+    "0x2aa6c5d56376c371f88a6cc42e852824994993cb9bab8d3e6450cbe3cb32b94e",
+    "0xb5bd3599ec7f4ae86afd84398f6f2d862deecce965e8ace2d8d8c8108d5076df",
+    "0x0000000000000000000000000000000000000000000000000000000000000002",
+    "0x5306f64e312b581766351c07af79c72fcb1cd25147157fdc2f8ad76de9a3fb6a",
+    "0xb5bd3599ec7f4ae86afd84398f6f2d862deecce965e8ace2d8d8c8108d5076df",
+    "0x05680e9030c147b413a489f7891273acc221d49bd061c433e5771bc170fc37ac"
+  ],
+  "effects": {
+    "status": {
+      "status": "success"
+    },
+    "gasUsed": {
+      "computationCost": "164000",
+      "storageCost": "20725200",
+      "storageRebate": "24761484",
+      "nonRefundableStorageFee": "250116"
+    },
+    "gasObject": {
+      "owner": {
+        "AddressOwner": "0x1b4cd8b734f2465614678ca0450ce9c4f2ff4835c6a7545522892a1a8fb67991"
+      }
+    }
+  },
+  "events": [
+    {
+      "type": "0xecf47609d7da919ea98e7fd04f6e0648a0a79b337aaad373fa37aac8febf19c8::treasury::Burn<0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC>",
+      "parsedJson": {
+        "amount": "2605390809"
+      },
+      "packageId": "0x2aa6c5d56376c371f88a6cc42e852824994993cb9bab8d3e6450cbe3cb32b94e"
+    },
+    {
+      "type": "0xb5bd3599ec7f4ae86afd84398f6f2d862deecce965e8ace2d8d8c8108d5076df::bridge_with_fee::BridgeSubmittedWithFee",
+      "parsedJson": {
+        "amount_bridged": "2605390809",
+        "dest_domain": 3
+      },
+      "packageId": "0xb5bd3599ec7f4ae86afd84398f6f2d862deecce965e8ace2d8d8c8108d5076df"
+    },
+    {
+      "type": "0xb5bd3599ec7f4ae86afd84398f6f2d862deecce965e8ace2d8d8c8108d5076df::init_order::InitMctpLogged",
+      "parsedJson": {
+        "amount_in_initial": "2605390809",
+        "coin_type": "dba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC"
+      },
+      "packageId": "0xb5bd3599ec7f4ae86afd84398f6f2d862deecce965e8ace2d8d8c8108d5076df"
+    },
+    {
+      "type": "0x05680e9030c147b413a489f7891273acc221d49bd061c433e5771bc170fc37ac::referrer_logger::ReferrerSet",
+      "parsedJson": {
+        "fee_rate_ref": 50
+      },
+      "packageId": "0x05680e9030c147b413a489f7891273acc221d49bd061c433e5771bc170fc37ac"
+    }
+  ],
+  "balanceChanges": [
+    {
+      "owner": {
+        "AddressOwner": "0x1b4cd8b734f2465614678ca0450ce9c4f2ff4835c6a7545522892a1a8fb67991"
+      },
+      "coinType": "0x2::sui::SUI",
+      "amount": "3872284"
+    },
+    {
+      "owner": {
+        "AddressOwner": "0x1b4cd8b734f2465614678ca0450ce9c4f2ff4835c6a7545522892a1a8fb67991"
+      },
+      "coinType": "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC",
+      "amount": "-2605390809"
+    }
+  ],
+  "timestampMs": "1780011954804"
+}