@layerzerolabs/lz-sui-sdk-v2 3.0.135 → 3.0.137-sui.0

package/src/modules/endpoint.ts

@@ -68,12 +68,9 @@ export const EndpointErrorCode = {
     MessagingComposer_EComposeNotFound: 3,
     MessagingComposer_EComposerNotRegistered: 4,
     MessagingComposer_EComposerRegistered: 5,
-    MessagingComposer_EInvalidLZComposeInfo: 6,
-
     // OAppRegistry related errors (with OAppRegistry_ prefix)
-    OAppRegistry_EInvalidLZReceiveInfo: 1,
-    OAppRegistry_EOAppNotRegistered: 2,
-    OAppRegistry_EOAppRegistered: 3,
+    OAppRegistry_EOAppNotRegistered: 1,
+    OAppRegistry_EOAppRegistered: 2,
 
     // Endpoint related errors (with Endpoint_ prefix)
     Endpoint_EAlreadyInitialized: 1,
@@ -120,16 +117,17 @@ export class Endpoint {
      * Register an OApp with the endpoint
      * @param tx - The transaction to add the move call to
      * @param oappCap - The OApp capability object ID or transaction argument
-     * @param lzReceiveInfo - Transaction result containing LayerZero receive information
+     * @param oappInfo - OApp information including lz_receive execution information
+     * @returns Transaction result containing the messaging channel address
      */
     registerOAppMoveCall(
         tx: Transaction,
         oappCap: string | TransactionArgument,
-        lzReceiveInfo: Uint8Array | TransactionArgument
-    ): void {
-        tx.moveCall({
+        oappInfo: Uint8Array | TransactionArgument
+    ): TransactionResult {
+        return tx.moveCall({
             target: this.#target('register_oapp'),
-            arguments: [tx.object(this.objects.endpointV2), asObject(tx, oappCap), asBytes(tx, lzReceiveInfo)],
+            arguments: [tx.object(this.objects.endpointV2), asObject(tx, oappCap), asBytes(tx, oappInfo)],
         })
     }
 
@@ -151,25 +149,25 @@ export class Endpoint {
     }
 
     /**
-     * Set LayerZero receive information for an OApp
+     * Set OApp information for an OApp
      * @param tx - The transaction to add the move call to
      * @param callerCap - The caller capability object ID or transaction argument
      * @param oapp - The OApp address or transaction argument
-     * @param lzReceiveInfo - The LayerZero receive information as bytes or transaction argument
+     * @param oappInfo - The OApp information including lz_receive execution information as bytes or transaction argument
      */
-    setLzReceiveInfoMoveCall(
+    setOappInfoMoveCall(
         tx: Transaction,
         callerCap: string | TransactionArgument,
         oapp: string | TransactionArgument,
-        lzReceiveInfo: Uint8Array | TransactionArgument
+        oappInfo: Uint8Array | TransactionArgument
     ): void {
         tx.moveCall({
-            target: this.#target('set_lz_receive_info'),
+            target: this.#target('set_oapp_info'),
             arguments: [
                 tx.object(this.objects.endpointV2),
                 asObject(tx, callerCap),
                 asAddress(tx, oapp),
-                asBytes(tx, lzReceiveInfo),
+                asBytes(tx, oappInfo),
             ],
         })
     }
@@ -555,33 +553,34 @@ export class Endpoint {
      * Register a composer with the endpoint
      * @param tx - The transaction to add the move call to
      * @param composerCap - The composer capability object ID or transaction argument
-     * @param lzComposeInfo - LayerZero compose information as bytes
+     * @param composerInfo - Composer information including lz_compose execution information as bytes
+     * @returns Transaction result containing the compose queue address
      */
     registerComposerMoveCall(
         tx: Transaction,
         composerCap: string | TransactionArgument,
-        lzComposeInfo: Uint8Array | TransactionArgument
-    ): void {
-        tx.moveCall({
+        composerInfo: Uint8Array | TransactionArgument
+    ): TransactionResult {
+        return tx.moveCall({
             target: this.#target('register_composer'),
-            arguments: [tx.object(this.objects.endpointV2), asObject(tx, composerCap), asBytes(tx, lzComposeInfo)],
+            arguments: [tx.object(this.objects.endpointV2), asObject(tx, composerCap), asBytes(tx, composerInfo)],
         })
     }
 
     /**
-     * Set LayerZero compose information for a composer
+     * Set composer information for a composer
      * @param tx - The transaction to add the move call to
      * @param composerCap - The composer capability object ID or transaction argument
-     * @param lzComposeInfo - LayerZero compose information as bytes or transaction argument
+     * @param composerInfo - Composer information including lz_compose execution information as bytes or transaction argument
      */
-    setLzComposeInfoMoveCall(
+    setComposerInfoMoveCall(
         tx: Transaction,
         composerCap: string | TransactionArgument,
-        lzComposeInfo: Uint8Array | TransactionArgument
+        composerInfo: Uint8Array | TransactionArgument
     ): void {
         tx.moveCall({
-            target: this.#target('set_lz_compose_info'),
-            arguments: [tx.object(this.objects.endpointV2), asObject(tx, composerCap), asBytes(tx, lzComposeInfo)],
+            target: this.#target('set_composer_info'),
+            arguments: [tx.object(this.objects.endpointV2), asObject(tx, composerCap), asBytes(tx, composerInfo)],
         })
     }
 
@@ -1032,28 +1031,28 @@ export class Endpoint {
     }
 
     /**
-     * Get LayerZero receive information for an OApp
+     * Get OApp information for an OApp
      * @param tx - The transaction to add the move call to
      * @param oapp - The OApp address or transaction argument
-     * @returns Transaction result containing the receive information
+     * @returns Transaction result containing the OApp information including lz_receive execution information
      */
-    getLzReceiveInfoMoveCall(tx: Transaction, oapp: string | TransactionArgument): TransactionResult {
+    getOappInfoMoveCall(tx: Transaction, oapp: string | TransactionArgument): TransactionResult {
         return tx.moveCall({
-            target: this.#target('get_lz_receive_info'),
+            target: this.#target('get_oapp_info'),
             arguments: [tx.object(this.objects.endpointV2), asAddress(tx, oapp)],
         })
     }
 
     /**
-     * Get LayerZero receive information for an OApp
+     * Get OApp information for an OApp
      * @param oapp - The OApp address
-     * @returns Promise<Uint8Array> - The receive information as bytes
+     * @returns Promise<Uint8Array> - The OApp information including lz_receive execution information as bytes
      */
-    async getLzReceiveInfo(oapp: string): Promise<Uint8Array> {
+    async getOappInfo(oapp: string): Promise<Uint8Array> {
         return executeSimulate(
             this.client,
             (tx) => {
-                return this.getLzReceiveInfoMoveCall(tx, oapp)
+                return this.getOappInfoMoveCall(tx, oapp)
             },
             (result) => {
                 const parsed = bcs.vector(bcs.u8()).parse(result[0].value)
@@ -1147,28 +1146,28 @@ export class Endpoint {
     }
 
     /**
-     * Get LayerZero compose information for a composer
+     * Get composer information for a registered composer
      * @param tx - The transaction to add the move call to
      * @param composer - The composer address or transaction argument
-     * @returns Transaction result containing the compose information
+     * @returns Transaction result containing the composer information
      */
-    getLzComposeInfoMoveCall(tx: Transaction, composer: string | TransactionArgument): TransactionResult {
+    getComposerInfoMoveCall(tx: Transaction, composer: string | TransactionArgument): TransactionResult {
         return tx.moveCall({
-            target: this.#target('get_lz_compose_info'),
+            target: this.#target('get_composer_info'),
             arguments: [tx.object(this.objects.endpointV2), asAddress(tx, composer)],
         })
     }
 
     /**
-     * Get LayerZero compose information for a composer
+     * Get composer information for a registered composer
      * @param composer - The composer address
-     * @returns Promise<Uint8Array> - The compose information as bytes
+     * @returns Promise<Uint8Array> - The composer information as bytes
      */
-    async getLzComposeInfo(composer: string): Promise<Uint8Array> {
+    async getComposerInfo(composer: string): Promise<Uint8Array> {
         return executeSimulate(
             this.client,
             (tx) => {
-                this.getLzComposeInfoMoveCall(tx, composer)
+                this.getComposerInfoMoveCall(tx, composer)
             },
             (result) => {
                 const parsed = bcs.vector(bcs.u8()).parse(result[0].value)
@@ -2317,16 +2316,13 @@ export class Endpoint {
     async populateLzReceiveTransaction(
         tx: Transaction,
         lzReceiveCall: TransactionResult,
-        oapp: string, // receiver oapp
+        oapp: string | TransactionArgument, // receiver oapp
         sender: string | undefined = undefined,
         validators: IPTBValidator[] = [],
         maxSimulationTimes = DEFAULT_SIMULATION_TIMES
     ): Promise<MoveCall[]> {
         const simulateTx = Transaction.from(tx)
-        simulateTx.moveCall({
-            target: this.#target('get_lz_receive_info'),
-            arguments: [simulateTx.object(this.objects.endpointV2), simulateTx.pure.address(oapp)],
-        })
+        this.getOappInfoMoveCall(simulateTx, oapp)
         const moveCalls = await this.moduleManager.getPtbBuilder().simulateLzReceivePtb(simulateTx, sender)
 
         const [_, finalMoveCalls] = await this.moduleManager
@@ -2361,16 +2357,13 @@ export class Endpoint {
     async populateLzComposeTransaction(
         tx: Transaction,
         endpointLzComposeCall: TransactionResult,
-        composer: string,
+        composer: string | TransactionArgument,
         sender: string | undefined = undefined,
         validators: IPTBValidator[] = [],
         maxSimulationTimes = DEFAULT_SIMULATION_TIMES
     ): Promise<MoveCall[]> {
         const simulateTx = Transaction.from(tx)
-        simulateTx.moveCall({
-            target: this.#target('get_lz_compose_info'),
-            arguments: [simulateTx.object(this.objects.endpointV2), simulateTx.pure.address(composer)],
-        })
+        this.getComposerInfoMoveCall(simulateTx, composer)
         const moveCalls = await this.moduleManager.getPtbBuilder().simulateLzComposePtb(simulateTx, sender)
 
         const [_, finalMoveCalls] = await this.moduleManager

package/src/modules/oapps/counter.ts

@@ -109,7 +109,6 @@ export class Counter {
      * @param dstEid - Destination endpoint ID
      * @param msgType - Message type (SEND or SEND_AND_CALL)
      * @param options - Execution options as bytes
-     * @param sendValue - Value to send with the message
      * @param nativeFee - Native token fee amount
      * @param zroFee - ZRO token fee amount
      * @param refundAddress - Address for fee refunds
@@ -120,7 +119,6 @@ export class Counter {
         dstEid: EndpointId | TransactionArgument,
         msgType: number | TransactionArgument,
         options: Uint8Array | TransactionArgument,
-        sendValue: bigint | TransactionArgument,
         nativeFee: bigint | TransactionArgument,
         zroFee: bigint | TransactionArgument,
         refundAddress: string | TransactionArgument,
@@ -138,7 +136,6 @@ export class Counter {
                 asU32(tx, dstEid),
                 asU8(tx, msgType),
                 asBytes(tx, options),
-                asU64(tx, sendValue),
                 nativeToken,
                 zroToken,
                 asAddress(tx, refundAddress),
@@ -148,19 +145,19 @@ export class Counter {
     }
 
     /**
-     * Set LayerZero compose information for counter
+     * Set composer information for counter
      * @param tx - The transaction to add the move call to
-     * @param lzComposeInfo - LayerZero compose information as bytes
+     * @param composerInfo - Composer information including lz_compose execution information as bytes
      */
-    setLzComposeInfoMoveCall(tx: Transaction, lzComposeInfo: Uint8Array | TransactionArgument): void {
+    setComposerInfoMoveCall(tx: Transaction, composerInfo: Uint8Array | TransactionArgument): void {
         tx.moveCall({
-            target: this.#target('set_lz_compose_info'),
+            target: this.#target('set_composer_info'),
             arguments: [
                 tx.object(this.objects.counter),
                 tx.object(this.objects.counterOapp),
                 tx.object(this.objects.counterAdminCap),
                 tx.object(this.objects.endpointV2),
-                asBytes(tx, lzComposeInfo),
+                asBytes(tx, composerInfo),
             ],
         })
     }

package/src/modules/oapps/oapp.ts

@@ -64,17 +64,11 @@ export class OApp {
         this.objects = objects
     }
 
-    // setOAppInfo(oappInfo: OAppInfoV1): void {
-    //     this.oappInfo = oappInfo
-    // }
-
     // === Set Functions ===
 
     /**
      * Set enforced options for OApp messaging
      * @param tx - The transaction to add the move call to
-     * @param oapp - The OApp object ID or transaction argument
-     * @param adminCap - The admin capability object ID or transaction argument
      * @param eid - Endpoint ID or transaction argument
      * @param msgType - Message type or transaction argument
      * @param options - Enforced options as bytes or transaction argument
@@ -102,8 +96,6 @@ export class OApp {
     /**
      * Set peer OApp on another chain
      * @param tx - The transaction to add the move call to
-     * @param oapp - The OApp object ID or transaction argument
-     * @param adminCap - The admin capability object ID or transaction argument
      * @param eid - Peer endpoint ID or transaction argument
      * @param peer - Peer OApp address as bytes or transaction argument
      */
@@ -161,7 +153,6 @@ export class OApp {
     /**
      * Get OApp CallCap identifier
      * @param tx - The transaction to add the move call to
-     * @param oapp - The OApp object ID or transaction argument
      * @returns Transaction result containing the OApp CallCap identifier
      */
     async getOAppCapIdMoveCall(tx: Transaction): Promise<TransactionResult> {
@@ -174,7 +165,6 @@ export class OApp {
 
     /**
      * Get OApp CallCap identifier
-     * @param oapp - The OApp object ID (optional, uses configured oapp if not provided)
      * @returns Promise<string> - The OApp CallCap identifier
      */
     async getOAppCapId(): Promise<string> {
@@ -190,7 +180,6 @@ export class OApp {
     /**
      * Combine enforced options with extra options for message execution
      * @param tx - The transaction to add the move call to
-     * @param oapp - The OApp object ID or transaction argument
      * @param eid - Destination endpoint ID or transaction argument
      * @param msgType - Message type or transaction argument
      * @param extraOptions - Extra options to combine with enforced options or transaction argument
@@ -216,7 +205,6 @@ export class OApp {
 
     /**
      * Combine enforced options with extra options for message execution
-     * @param oapp - The OApp object ID
      * @param eid - Destination endpoint ID
      * @param msgType - Message type
      * @param extraOptions - Extra options to combine with enforced options
@@ -235,7 +223,6 @@ export class OApp {
     /**
      * Get enforced options for a specific destination and message type
      * @param tx - The transaction to add the move call to
-     * @param oapp - The OApp object ID or transaction argument
      * @param eid - Destination endpoint ID or transaction argument
      * @param msgType - Message type or transaction argument
      * @returns Transaction result containing enforced options
@@ -254,7 +241,6 @@ export class OApp {
 
     /**
      * Get enforced options for a specific destination and message type
-     * @param oapp - The OApp object ID
      * @param eid - Destination endpoint ID
      * @param msgType - Message type
      * @returns Promise<Uint8Array> - Enforced options as bytes
@@ -272,7 +258,6 @@ export class OApp {
     /**
      * Check if a peer is configured for a specific destination chain
      * @param tx - The transaction to add the move call to
-     * @param oapp - The OApp object ID or transaction argument
      * @param dstEid - Destination endpoint ID or transaction argument
      * @returns Transaction result containing boolean result
      */
@@ -286,7 +271,6 @@ export class OApp {
 
     /**
      * Check if a peer is configured for a specific destination chain
-     * @param oapp - The OApp object ID
      * @param dstEid - Destination endpoint ID
      * @returns Promise<boolean> - True if peer is configured, false otherwise
      */
@@ -303,7 +287,6 @@ export class OApp {
     /**
      * Get the configured peer address for a specific destination chain
      * @param tx - The transaction to add the move call to
-     * @param oapp - The OApp object ID or transaction argument
      * @param dstEid - Destination endpoint ID or transaction argument
      * @returns Transaction result containing peer address
      */
@@ -317,7 +300,6 @@ export class OApp {
 
     /**
      * Get the configured peer address for a specific destination chain
-     * @param oapp - The OApp object ID
      * @param dstEid - Destination endpoint ID
      * @returns Promise<Uint8Array> - Peer address as bytes32
      */
@@ -333,15 +315,24 @@ export class OApp {
         )
     }
 
+    /**
+     * Get OApp information V1 structure
+     * @param tx - The transaction to add the move call to
+     * @returns Transaction result containing the OApp information V1
+     */
     getOAppInfoV1MoveCall(tx: Transaction): TransactionResult {
         const endpoint = this.moduleManager.getEndpoint()
-        const oappInfoRaw = endpoint.getLzReceiveInfoMoveCall(tx, this.oappCallCapId) // the new OAppInfo used to be named as lz_receive_info
+        const oappInfoRaw = endpoint.getOappInfoMoveCall(tx, this.oappCallCapId) // the new OAppInfo used to be named as lz_receive_info
         return tx.moveCall({
-            target: `${this.packageId}::oapp_info_v1::decode`,
+            target: this.#target('decode', 'oapp_info_v1'),
             arguments: [oappInfoRaw],
         })
     }
 
+    /**
+     * Get OApp information V1 structure
+     * @returns Promise<OAppInfoV1> - The OApp information V1
+     */
     async getOAppInfoV1(): Promise<OAppInfoV1> {
         return executeSimulate(
             this.client,
@@ -354,16 +345,25 @@ export class OApp {
         )
     }
 
+    getOAppInfoV1ExtraInfoMoveCall(tx: Transaction, oappInfo: string | TransactionArgument): TransactionResult {
+        return tx.moveCall({
+            target: this.#target('extra_info', 'oapp_info_v1'),
+            arguments: [asObject(tx, oappInfo)],
+        })
+    }
+
     // === Endpoint Call Functions ===
 
     /**
      * Register OApp with the endpoint
      * @param tx - The transaction to add the move call to
+     * @param oappObjectId - The OApp object ID
      * @param oappInfo - OApp information as bytes (optional)
      * @returns Transaction result containing the messaging channel address
      */
     async registerOAppMoveCall(
         tx: Transaction,
+        oappObjectId: string,
         oappInfo?: Uint8Array | TransactionArgument
     ): Promise<TransactionResult> {
         let oappInfoArg: TransactionArgument
@@ -376,13 +376,11 @@ export class OApp {
             // For None
             oappInfoArg = tx.pure.option('vector<u8>', null)
         }
-
-        const oappInfoObj = await this.#oappInfo()
-        const adminCap = await this.getAdminCap(oappInfoObj.oapp_object)
+        const adminCap = await this.getAdminCap(oappObjectId)
         return tx.moveCall({
             target: this.#target('register_oapp', 'endpoint_calls'),
             arguments: [
-                asObject(tx, oappInfoObj.oapp_object),
+                asObject(tx, oappObjectId),
                 asObject(tx, adminCap),
                 asObject(tx, this.objects.endpointV2),
                 oappInfoArg,
@@ -413,14 +411,22 @@ export class OApp {
      * Set OApp information in the endpoint
      * @param tx - The transaction to add the move call to
      * @param oappInfo - OApp information as bytes
+     * @param oappObjectId - Optional OApp object ID (uses configured oapp if not provided)
      */
-    async setOAppInfoMoveCall(tx: Transaction, oappInfo: Uint8Array | TransactionArgument): Promise<void> {
-        const oappInfoObj = await this.#oappInfo()
-        const adminCap = await this.getAdminCap(oappInfoObj.oapp_object)
+    async setOAppInfoMoveCall(
+        tx: Transaction,
+        oappInfo: Uint8Array | TransactionArgument,
+        oappObjectId?: string
+    ): Promise<void> {
+        if (oappObjectId === undefined) {
+            const oappInfoObj = await this.#oappInfo()
+            oappObjectId = oappInfoObj.oapp_object
+        }
+        const adminCap = await this.getAdminCap(oappObjectId)
         tx.moveCall({
             target: this.#target('set_oapp_info', 'endpoint_calls'),
             arguments: [
-                asObject(tx, oappInfoObj.oapp_object),
+                asObject(tx, oappObjectId),
                 asObject(tx, adminCap),
                 asObject(tx, this.objects.endpointV2),
                 asBytes(tx, oappInfo),
@@ -703,6 +709,14 @@ export class OApp {
         })
     }
 
+    /**
+     * Refresh the cached OApp information by fetching the latest data
+     * @returns Promise<void> - Completes when the OApp info is refreshed
+     */
+    async refreshOAppInfo(): Promise<void> {
+        this.oappInfo = await this.getOAppInfoV1()
+    }
+
     // === Private Functions ===
 
     /**

package/deployments/sui-testnet/sequential_multi_call.json

@@ -1,45 +0,0 @@
-{
-  "name": "sequential_multi_call",
-  "address": "0xd047c658acf4c7233f39f50f1de333e42604f30c2f78f823ed3f329cb8b439f9",
-  "originalAddress": "0xd047c658acf4c7233f39f50f1de333e42604f30c2f78f823ed3f329cb8b439f9",
-  "publishedVersion": "1",
-  "network": "sui-testnet",
-  "digest": "6d5dc218b057ca033f1066b6c02d6541d76e497b986bb06b8ee5a59759aae397",
-  "transactionHash": "HKfzq9GBKo3rcuWx56e2YJPqy6N1DRu5Tjhi9tsqH9wb",
-  "upgradeCapId": "0x6b31bfdfdbc9f035e5fd27426173c947fb6e58e738d56aed4ade5172f18f0308",
-  "deployer": "0xcf1ac8c5f6eda68c74a5c64027ab5eb8e1664a50f1248876e9464ee4fb60a16a",
-  "objectChanges": [
-    {
-      "type": "mutated",
-      "sender": "0xcf1ac8c5f6eda68c74a5c64027ab5eb8e1664a50f1248876e9464ee4fb60a16a",
-      "owner": {
-        "AddressOwner": "0xcf1ac8c5f6eda68c74a5c64027ab5eb8e1664a50f1248876e9464ee4fb60a16a"
-      },
-      "objectType": "0x2::coin::Coin<0x2::sui::SUI>",
-      "objectId": "0x83b783a49bdf7efbc2e18987fc7c45cd069f3452fd37c51549fdf8490374b2ae",
-      "version": "577853062",
-      "previousVersion": "577853061",
-      "digest": "6Rk7B8xdJJ2tFy1mwudE46jMeZxJvDMnDFsvjWf7JttQ"
-    },
-    {
-      "type": "created",
-      "sender": "0xcf1ac8c5f6eda68c74a5c64027ab5eb8e1664a50f1248876e9464ee4fb60a16a",
-      "owner": {
-        "AddressOwner": "0xcf1ac8c5f6eda68c74a5c64027ab5eb8e1664a50f1248876e9464ee4fb60a16a"
-      },
-      "objectType": "0x2::package::UpgradeCap",
-      "objectId": "0x6b31bfdfdbc9f035e5fd27426173c947fb6e58e738d56aed4ade5172f18f0308",
-      "version": "577853062",
-      "digest": "Fsuhz4apoMegERostJkrBemqX1Sd9cTVYn2E58o7XhZF"
-    },
-    {
-      "type": "published",
-      "packageId": "0xd047c658acf4c7233f39f50f1de333e42604f30c2f78f823ed3f329cb8b439f9",
-      "version": "1",
-      "digest": "CsRcHBi7mKv8NEJQYyTYZUD9TRcBXbizTVkx9Y9oqQ8v",
-      "modules": [
-        "sequential_multi_call"
-      ]
-    }
-  ]
-}