@layerzerolabs/lz-sui-sdk-v2 3.0.133 → 3.0.134-sui.1

package/src/modules/oapps/counter.ts

@@ -7,11 +7,11 @@ import { EndpointId } from '@layerzerolabs/lz-definitions'
 import { ModuleManager } from '../../module-manager'
 import { MessagingFee, ObjectOptions } from '../../types'
 import {
+    IPTBValidator,
     asAddress,
     asBool,
     asBytes,
     asBytes32,
-    asObject,
     asU32,
     asU64,
     asU8,
@@ -22,15 +22,16 @@ import {
 const MODULE_NAME = 'counter'
 
 export const CounterErrorCode = {
-    // Counter related errors
+    // Counter related errors (matching counter.move)
     Counter_EInvalidMsgType: 0,
     Counter_EInvalidValue: 1,
     Counter_EInvalidNonce: 2,
     Counter_EOnlyEndpoint: 3,
     Counter_ESelfComposeOnly: 4,
     Counter_EInvalidOApp: 5,
-    Counter_EInvalidAdminCap: 6,
-    Counter_EAlreadyInitialized: 7,
+
+    // OptionsBuilder related errors (matching options_builder.move)
+    OptionsBuilder_EInvalidSize: 1,
 } as const
 
 export class Counter {
@@ -83,7 +84,8 @@ export class Counter {
         dstEid: EndpointId | TransactionArgument,
         msgType: number | TransactionArgument,
         options: Uint8Array | TransactionArgument,
-        payInZero: boolean | TransactionArgument
+        payInZero: boolean | TransactionArgument,
+        validators?: IPTBValidator[]
     ): Promise<MessagingFee> {
         const tx = new Transaction()
         const quoteCall = tx.moveCall({
@@ -97,7 +99,7 @@ export class Counter {
                 asBool(tx, payInZero),
             ],
         })
-        return this.moduleManager.getEndpoint().quote(tx, quoteCall)
+        return this.moduleManager.getEndpoint().quote(tx, quoteCall, undefined, validators)
     }
 
     /**
@@ -121,7 +123,8 @@ export class Counter {
         sendValue: bigint | TransactionArgument,
         nativeFee: bigint | TransactionArgument,
         zroFee: bigint | TransactionArgument,
-        refundAddress: string | TransactionArgument
+        refundAddress: string | TransactionArgument,
+        validators?: IPTBValidator[]
     ): Promise<void> {
         const [nativeToken] = tx.splitCoins(tx.gas, [asU64(tx, nativeFee)])
         const zroToken = isTransactionArgument(zroFee)
@@ -141,74 +144,55 @@ export class Counter {
                 asAddress(tx, refundAddress),
             ],
         })
-        await this.moduleManager.getEndpoint().populateSendTransaction(tx, incrementCall, sender)
+        await this.moduleManager.getEndpoint().populateSendTransaction(tx, incrementCall, sender, validators)
     }
 
     /**
-     * Set peer counter on another chain
+     * Set LayerZero compose information for counter
      * @param tx - The transaction to add the move call to
-     * @param messagingChannel - The messaging channel object ID or transaction argument
-     * @param eid - The peer endpoint ID or transaction argument
-     * @param peer - The peer counter address as bytes or transaction argument
+     * @param lzComposeInfo - LayerZero compose information as bytes
      */
-    setPeerMoveCall(
-        tx: Transaction,
-        messagingChannel: string | TransactionArgument,
-        eid: number | TransactionArgument,
-        peer: Uint8Array | TransactionArgument
-    ): void {
+    setLzComposeInfoMoveCall(tx: Transaction, lzComposeInfo: Uint8Array | TransactionArgument): void {
         tx.moveCall({
-            target: this.#target('set_peer'),
+            target: this.#target('set_lz_compose_info'),
             arguments: [
                 tx.object(this.objects.counter),
                 tx.object(this.objects.counterOapp),
                 tx.object(this.objects.counterAdminCap),
                 tx.object(this.objects.endpointV2),
-                asObject(tx, messagingChannel),
-                asU32(tx, eid),
-                asBytes32(tx, peer, this.moduleManager.getUtils()),
+                asBytes(tx, lzComposeInfo),
             ],
         })
     }
 
+    // === View Functions ===
+
     /**
-     * Set delegate for the counter
+     * Get counter EID
      * @param tx - The transaction to add the move call to
-     * @param newDelegate - The new delegate address or transaction argument
+     * @returns Transaction result containing the counter EID
      */
-    setDelegateMoveCall(tx: Transaction, newDelegate: string | TransactionArgument): void {
-        tx.moveCall({
-            target: this.#target('set_delegate'),
-            arguments: [
-                tx.object(this.objects.counter),
-                tx.object(this.objects.counterOapp),
-                tx.object(this.objects.counterAdminCap),
-                tx.object(this.objects.endpointV2),
-                asAddress(tx, newDelegate),
-            ],
+    getEidMoveCall(tx: Transaction): TransactionResult {
+        return tx.moveCall({
+            target: this.#target('eid'),
+            arguments: [tx.object(this.objects.counter)],
         })
     }
 
     /**
-     * Set LayerZero compose information for counter
-     * @param tx - The transaction to add the move call to
-     * @param lzComposeInfo - LayerZero compose information as bytes
+     * Get counter EID
+     * @returns Promise<number> - The counter EID
      */
-    setLzComposeInfoMoveCall(tx: Transaction, lzComposeInfo: Uint8Array | TransactionArgument): void {
-        tx.moveCall({
-            target: this.#target('set_lz_compose_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),
-            ],
-        })
+    async getEid(): Promise<number> {
+        return executeSimulate(
+            this.client,
+            (tx) => {
+                this.getEidMoveCall(tx)
+            },
+            (result) => bcs.U32.parse(result[0].value)
+        )
     }
 
-    // === View Functions ===
-
     /**
      * Get call capability address for counter
      * @param tx - The transaction to add the move call to