Fixing conflict

Author: SimonRastikian

crates/contract/src/snapshots/mpc_contract__foreign_chains_metadata__tests__foreign_chains_metadata_borsh_schema__should_not_change.snap

@@ -90,6 +90,11 @@ BorshSchemaContainer {
                     "Aptos",
                     "ForeignChain__Aptos",
                 ),
+                (
+                    12,
+                    "Sui",
+                    "ForeignChain__Sui",
+                ),
             ],
         },
         "ForeignChainRpcWhitelist": Struct {
@@ -139,6 +144,9 @@ BorshSchemaContainer {
         "ForeignChain__Starknet": Struct {
             fields: Empty,
         },
+        "ForeignChain__Sui": Struct {
+            fields: Empty,
+        },
         "ForeignChain__Ton": Struct {
             fields: Empty,
         },

crates/contract/tests/sandbox/common.rs

@@ -24,6 +24,7 @@ use near_account_id::AccountId;
 use near_mpc_contract_interface::types::{
     AptosAddress, AptosEvent, AptosExtractedValue, AptosExtractor, AptosFinality, AptosRpcRequest,
     AptosTxId, Curve, DomainConfig, DomainId, DomainPurpose, Protocol, ReconstructionThreshold,
+    SuiAddress, SuiEvent, SuiExtractedValue, SuiExtractor, SuiFinality, SuiRpcRequest, SuiTxId,
     SupportedForeignChains, TonAddress, TonCellBody, TonExtractedValue, TonExtractor, TonFinality,
     TonLog, TonRpcRequest, TonTxId,
 };
@@ -826,6 +827,18 @@ pub fn aptos_extracted_values() -> Vec<ExtractedValue> {
     )]
 }
 
+pub fn sui_extracted_values() -> Vec<ExtractedValue> {
+    vec![ExtractedValue::SuiExtractedValue(SuiExtractedValue::Event(
+        SuiEvent {
+            package_id: SuiAddress([1; 32]),
+            transaction_module: "omni_bridge".to_string(),
+            sender: SuiAddress([2; 32]),
+            type_tag: format!("0x{}::omni_bridge::InitTransfer", "01".repeat(32)),
+            bcs: vec![0xde, 0xad, 0xbe, 0xef],
+        },
+    ))]
+}
+
 pub fn bnb_evm_request() -> ForeignChainRpcRequest {
     ForeignChainRpcRequest::Bnb(EvmRpcRequest {
         tx_id: EvmTxId([0xbb; 32]),
@@ -885,3 +898,11 @@ pub fn aptos_request() -> ForeignChainRpcRequest {
         extractors: vec![AptosExtractor::Event { event_index: 0 }],
     })
 }
+
+pub fn sui_request() -> ForeignChainRpcRequest {
+    ForeignChainRpcRequest::Sui(SuiRpcRequest {
+        tx_id: SuiTxId([0xbb; 32]),
+        finality: SuiFinality::Checkpointed,
+        extractors: vec![SuiExtractor::Event { event_index: 0 }],
+    })
+}

crates/contract/tests/sandbox/foreign_chain_request.rs

@@ -6,7 +6,7 @@ use crate::sandbox::common::{
     bitcoin_extracted_values, bitcoin_request, bnb_evm_request, bogus_ton_log_extracted_value,
     ethereum_evm_request, evm_block_hash_extracted_values, hyper_evm_request, polygon_evm_request,
     register_foreign_chain_configuration, sign_foreign_tx_response, starknet_extracted_values,
-    starknet_request, ton_request,
+    starknet_request, sui_extracted_values, sui_request, ton_request,
 };
 use near_mpc_contract_interface::method_names;
 use near_mpc_contract_interface::types::{
@@ -31,6 +31,7 @@ const SIGNATURE_TIMEOUT_BLOCKS: u64 = 200;
 #[case::hyper_evm(hyper_evm_request(), evm_block_hash_extracted_values())]
 #[case::ton(ton_request(), bogus_ton_log_extracted_value())]
 #[case::aptos(aptos_request(), aptos_extracted_values())]
+#[case::sui(sui_request(), sui_extracted_values())]
 #[tokio::test]
 async fn verify_foreign_transaction__should_succeed(
     #[case] rpc_request: ForeignChainRpcRequest,
@@ -205,6 +206,7 @@ async fn verify_foreign_transaction__should_fan_out_response_to_duplicates_from_
 #[case::hyper_evm(hyper_evm_request())]
 #[case::ton(ton_request())]
 #[case::aptos(aptos_request())]
+#[case::sui(sui_request())]
 #[tokio::test]
 async fn verify_foreign_transaction__should_reject_without_policy(
     #[case] rpc_request: ForeignChainRpcRequest,
@@ -253,6 +255,7 @@ async fn verify_foreign_transaction__should_reject_without_policy(
 #[case::hyper_evm(hyper_evm_request())]
 #[case::ton(ton_request())]
 #[case::aptos(aptos_request())]
+#[case::sui(sui_request())]
 #[tokio::test]
 async fn verify_foreign_transaction__should_timeout_without_response(
     #[case] rpc_request: ForeignChainRpcRequest,

crates/contract/tests/snapshots/abi__abi_has_not_changed.snap

@@ -251,6 +251,11 @@ expression: abi
                       11,
                       "Aptos",
                       "ForeignChain__Aptos"
+                    ],
+                    [
+                      12,
+                      "Sui",
+                      "ForeignChain__Sui"
                     ]
                   ]
                 }
@@ -288,6 +293,9 @@ expression: abi
               "ForeignChain__Starknet": {
                 "Struct": null
               },
+              "ForeignChain__Sui": {
+                "Struct": null
+              },
               "ForeignChain__Ton": {
                 "Struct": null
               },
@@ -2186,6 +2194,11 @@ expression: abi
                           11,
                           "Aptos",
                           "ForeignChain__Aptos"
+                        ],
+                        [
+                          12,
+                          "Sui",
+                          "ForeignChain__Sui"
                         ]
                       ]
                     }
@@ -2223,6 +2236,9 @@ expression: abi
                   "ForeignChain__Starknet": {
                     "Struct": null
                   },
+                  "ForeignChain__Sui": {
+                    "Struct": null
+                  },
                   "ForeignChain__Ton": {
                     "Struct": null
                   },
@@ -3133,7 +3149,8 @@ expression: abi
             "Polygon",
             "HyperEvm",
             "Ton",
-            "Aptos"
+            "Aptos",
+            "Sui"
           ]
         },
         "ForeignChainConfiguration": {
@@ -3288,6 +3305,18 @@ expression: abi
                 }
               },
               "additionalProperties": false
+            },
+            {
+              "type": "object",
+              "required": [
+                "Sui"
+              ],
+              "properties": {
+                "Sui": {
+                  "$ref": "#/definitions/SuiRpcRequest"
+                }
+              },
+              "additionalProperties": false
             }
           ]
         },
@@ -4809,6 +4838,66 @@ expression: abi
         "StarknetTxId": {
           "$ref": "#/definitions/StarknetFelt"
         },
+        "SuiExtractor": {
+          "oneOf": [
+            {
+              "type": "object",
+              "required": [
+                "Event"
+              ],
+              "properties": {
+                "Event": {
+                  "type": "object",
+                  "required": [
+                    "event_index"
+                  ],
+                  "properties": {
+                    "event_index": {
+                      "type": "integer",
+                      "format": "uint64",
+                      "minimum": 0.0
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            }
+          ]
+        },
+        "SuiFinality": {
+          "description": "Sui has no reorgs; a transaction is final once it is included in a committee-certified checkpoint.",
+          "type": "string",
+          "enum": [
+            "Checkpointed"
+          ]
+        },
+        "SuiRpcRequest": {
+          "type": "object",
+          "required": [
+            "extractors",
+            "finality",
+            "tx_id"
+          ],
+          "properties": {
+            "extractors": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SuiExtractor"
+              }
+            },
+            "finality": {
+              "$ref": "#/definitions/SuiFinality"
+            },
+            "tx_id": {
+              "$ref": "#/definitions/SuiTxId"
+            }
+          }
+        },
+        "SuiTxId": {
+          "description": "32-byte Sui transaction digest (Blake2b-256 of the signed transaction data). Sui APIs display it base58-encoded; here it is carried as raw bytes (hex in JSON).",
+          "type": "string",
+          "pattern": "^(?:[0-9A-Fa-f]{2})*$"
+        },
         "SupportedForeignChains": {
           "type": "array",
           "items": {