chore(sui): reflect changes to voyager

aeryz · aeryz · commit d0530ca6dd27 · 2025-10-03T14:28:59.000+03:00
Signed-off-by: aeryz &lt;abdullaheryz@protonmail.com&gt;
diff --git a/sui/vault/sources/metadata.move b/sui/vault/sources/metadata.move
@@ -1,3 +1,63 @@
+
+// License text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.
+// "Business Source License" is a trademark of MariaDB Corporation Ab.
+
+// Parameters
+
+// Licensor:             Union.fi, Labs Inc.
+// Licensed Work:        All files under https://github.com/unionlabs/union's sui subdirectory                      
+//                       The Licensed Work is (c) 2024 Union.fi, Labs Inc.
+// Change Date:          Four years from the date the Licensed Work is published.
+// Change License:       Apache-2.0
+// 
+
+// For information about alternative licensing arrangements for the Licensed Work,
+// please contact info@union.build.
+
+// Notice
+
+// Business Source License 1.1
+
+// Terms
+
+// The Licensor hereby grants you the right to copy, modify, create derivative
+// works, redistribute, and make non-production use of the Licensed Work. The
+// Licensor may make an Additional Use Grant, above, permitting limited production use.
+
+// Effective on the Change Date, or the fourth anniversary of the first publicly
+// available distribution of a specific version of the Licensed Work under this
+// License, whichever comes first, the Licensor hereby grants you rights under
+// the terms of the Change License, and the rights granted in the paragraph
+// above terminate.
+
+// If your use of the Licensed Work does not comply with the requirements
+// currently in effect as described in this License, you must purchase a
+// commercial license from the Licensor, its affiliated entities, or authorized
+// resellers, or you must refrain from using the Licensed Work.
+
+// All copies of the original and modified Licensed Work, and derivative works
+// of the Licensed Work, are subject to this License. This License applies
+// separately for each version of the Licensed Work and the Change Date may vary
+// for each version of the Licensed Work released by Licensor.
+
+// You must conspicuously display this License on each original or modified copy
+// of the Licensed Work. If you receive the Licensed Work in original or
+// modified form from a third party, the terms and conditions set forth in this
+// License apply to your use of that work.
+
+// Any use of the Licensed Work in violation of this License will automatically
+// terminate your rights under this License for the current and all other
+// versions of the Licensed Work.
+
+// This License does not grant you any right in any trademark or logo of
+// Licensor or its affiliates (provided that you may use a trademark or logo of
+// Licensor as expressly required by this License).
+
+// TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
+// AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+// EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
+// TITLE.
 module vault::metadata {
     use std::string::String;
 
diff --git a/voyager/plugins/sui-ibc-app/src/main.rs b/voyager/plugins/sui-ibc-app/src/main.rs
@@ -1,6 +1,5 @@
-use std::{collections::VecDeque, sync::Arc};
+use std::collections::VecDeque;
 
-use concurrent_keyring::{ConcurrentKeyring, KeyringConfig, KeyringEntry};
 use ibc_union_spec::datagram::{MsgPacketAcknowledgement, MsgPacketRecv};
 use jsonrpsee::{
     core::{async_trait, JsonValue as Value, RpcResult},
@@ -54,7 +53,8 @@ pub struct Module {
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct ZkgmConfig {
-    address: SuiAddress,
+    zkgm_address: SuiAddress,
+    vault_object_id: ObjectID,
     /// ID of the `wrapped_token_to_t` mapping
     wrapped_token_to_t: ObjectID,
 }
@@ -109,21 +109,8 @@ impl TransactionPluginServer for Module {
     ) -> RpcResult<ProgrammableTransaction> {
         let mut ptb = ProgrammableTransactionBuilder::new();
 
-        let store_initial_seq = self
-            .sui_client
-            .read_api()
-            .get_object_with_options(
-                module_info.stores[0].into(),
-                SuiObjectDataOptions::new().with_owner(),
-            )
-            .await
-            .unwrap()
-            .data
-            .expect("object exists on chain")
-            .owner
-            .expect("owner will be present")
-            .start_version()
-            .expect("object is shared, hence it has a start version");
+        let store_initial_seq = self.get_initial_seq(module_info.stores[0].into()).await;
+        let vault_store_initial_seq = self.get_initial_seq(self.zkgm_config.vault_object_id).await;
 
         // If the module is ZKGM, then we register the tokens if needed. Otherwise,
         // the registered tokens are returned.
@@ -151,6 +138,8 @@ impl TransactionPluginServer for Module {
                 self,
                 &module_info,
                 store_initial_seq,
+                self.zkgm_config.vault_object_id,
+                vault_store_initial_seq,
                 coin_t,
                 fee_recipient,
                 data.relayer_msgs.clone(),
@@ -175,21 +164,8 @@ impl TransactionPluginServer for Module {
     ) -> RpcResult<ProgrammableTransaction> {
         let mut ptb = ProgrammableTransactionBuilder::new();
 
-        let store_initial_seq = self
-            .sui_client
-            .read_api()
-            .get_object_with_options(
-                module_info.stores[0].into(),
-                SuiObjectDataOptions::new().with_owner(),
-            )
-            .await
-            .unwrap()
-            .data
-            .expect("object exists on chain")
-            .owner
-            .expect("owner will be present")
-            .start_version()
-            .expect("object is shared, hence it has a start version");
+        let store_initial_seq = self.get_initial_seq(module_info.stores[0].into()).await;
+        let vault_store_initial_seq = self.get_initial_seq(self.zkgm_config.vault_object_id).await;
 
         // If the module is ZKGM, then we register the tokens if needed. Otherwise,
         // the registered tokens are returned.
@@ -206,6 +182,8 @@ impl TransactionPluginServer for Module {
                 self,
                 &module_info,
                 store_initial_seq,
+                self.zkgm_config.vault_object_id,
+                vault_store_initial_seq,
                 coin_t,
                 fee_recipient,
                 session,
@@ -253,6 +231,20 @@ impl Module {
             zkgm_config: config.zkgm_config,
         })
     }
+
+    async fn get_initial_seq(&self, object: ObjectID) -> SequenceNumber {
+        self.sui_client
+            .read_api()
+            .get_object_with_options(object, SuiObjectDataOptions::new().with_owner())
+            .await
+            .unwrap()
+            .data
+            .expect("object exists on chain")
+            .owner
+            .expect("owner will be present")
+            .start_version()
+            .expect("object is shared, hence it has a start version")
+    }
 }
 
 #[async_trait]
diff --git a/voyager/plugins/sui-ibc-app/src/zkgm.rs b/voyager/plugins/sui-ibc-app/src/zkgm.rs
@@ -82,11 +82,14 @@ pub fn begin_recv_call(
     ))
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn recv_packet_call(
     ptb: &mut ProgrammableTransactionBuilder,
     module: &Module,
     module_info: &ModuleInfo,
-    store_initial_seq: SequenceNumber,
+    zkgm_store_initial_seq: SequenceNumber,
+    vault_object_id: ObjectID,
+    vault_store_initial_seq: SequenceNumber,
     coin_t: TypeTag,
     fee_recipient: SuiAddress,
     relayer_msgs: Vec<Bytes>,
@@ -100,7 +103,12 @@ pub fn recv_packet_call(
         }),
         CallArg::Object(ObjectArg::SharedObject {
             id: module_info.stores[0].into(),
-            initial_shared_version: store_initial_seq,
+            initial_shared_version: zkgm_store_initial_seq,
+            mutable: true,
+        }),
+        CallArg::Object(ObjectArg::SharedObject {
+            id: vault_object_id,
+            initial_shared_version: vault_store_initial_seq,
             mutable: true,
         }),
         SUI_CALL_ARG_CLOCK,
@@ -196,11 +204,14 @@ pub fn begin_ack_call(
     ))
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn acknowledge_packet_call(
     ptb: &mut ProgrammableTransactionBuilder,
     module: &Module,
     module_info: &ModuleInfo,
-    store_initial_seq: SequenceNumber,
+    zkgm_store_initial_seq: SequenceNumber,
+    vault_object_id: ObjectID,
+    vault_store_initial_seq: SequenceNumber,
     coin_t: TypeTag,
     fee_recipient: SuiAddress,
     session: Argument,
@@ -213,7 +224,12 @@ pub fn acknowledge_packet_call(
         }),
         CallArg::Object(ObjectArg::SharedObject {
             id: module_info.stores[0].into(),
-            initial_shared_version: store_initial_seq,
+            initial_shared_version: zkgm_store_initial_seq,
+            mutable: true,
+        }),
+        CallArg::Object(ObjectArg::SharedObject {
+            id: vault_object_id,
+            initial_shared_version: vault_store_initial_seq,
             mutable: true,
         }),
         CallArg::Pure(bcs::to_bytes(&fee_recipient).unwrap()),
