@layerzerolabs/lz-sui-sdk-v2 3.0.134-sui.3 → 3.0.134

package/src/modules/message-libs/uln302.ts

@@ -19,7 +19,7 @@ import {
 
 const MODULE_NAME = 'uln_302'
 
-// ULN-302 specific error codes (matching uln-302 contract files)
+// ULN-302 specific error codes
 export const Uln302ErrorCode = {
     SendUln302_EDefaultExecutorConfigNotFound: 1,
     SendUln302_EDefaultUlnConfigNotFound: 2,
@@ -33,28 +33,10 @@ export const Uln302ErrorCode = {
     ReceiveUln302_EOAppUlnConfigNotFound: 4,
     ReceiveUln302_EVerifying: 5,
 
-    Uln302_EInvalidConfigType: 1,
-    Uln302_EInvalidMessagingChannel: 2,
-    Uln302_EUnsupportedEid: 3,
-
-    // UlnConfig related errors (matching uln_config.move)
-    UlnConfig_EAtLeastOneDVN: 1,
-    UlnConfig_EDuplicateOptionalDVNs: 2,
-    UlnConfig_EDuplicateRequiredDVNs: 3,
-    UlnConfig_EInvalidOptionalDVNCount: 4,
-    UlnConfig_EInvalidOptionalDVNThreshold: 5,
-    UlnConfig_EInvalidRequiredDVNCount: 6,
-    UlnConfig_EInvalidUlnConfigBytes: 7,
-
-    // OAppUlnConfig related errors (matching oapp_uln_config.move)
-    OAppUlnConfig_EInvalidConfirmations: 1,
-    OAppUlnConfig_EInvalidRequiredDVNs: 2,
-    OAppUlnConfig_EInvalidOptionalDVNs: 3,
-
-    // ExecutorConfig related errors (matching executor_config.move)
-    ExecutorConfig_EInvalidExecutorAddress: 1,
-    ExecutorConfig_EInvalidExecutorBytes: 2,
-    ExecutorConfig_EZeroMessageSize: 3,
+    Uln302_EEndpointInitialized: 1,
+    Uln302_EInvalidConfigType: 2,
+    Uln302_EInvalidMessagingChannel: 3,
+    Uln302_EUnsupportedEid: 4,
 } as const
 
 export class Uln302 {
@@ -180,16 +162,32 @@ export class Uln302 {
     }
 
     /**
-     * Verify packet move call with DVN call (new API)
-     * Note: This is typically called by DVNs via Call objects, not directly by users
+     * Verify packet move call with DVN signatures
+     * Note: This is typically called by DVNs, not directly by users
      * @param tx - The transaction to add the move call to
      * @param verification - The verification object address or transaction argument
-     * @param call - The DVN verification call containing verification parameters
+     * @param dvn - The DVN address performing verification or transaction argument
+     * @param packetHeader - The packet header as bytes or transaction argument
+     * @param payloadHash - The payload hash as bytes or transaction argument
+     * @param confirmations - Required confirmations count or transaction argument
      */
-    verifyMoveCall(tx: Transaction, verification: string | TransactionArgument, call: TransactionArgument): void {
+    verifyMoveCall(
+        tx: Transaction,
+        verification: string | TransactionArgument,
+        dvn: string | TransactionArgument,
+        packetHeader: Uint8Array | TransactionArgument,
+        payloadHash: Uint8Array | TransactionArgument,
+        confirmations: bigint | TransactionArgument
+    ): void {
         tx.moveCall({
             target: this.#target('verify'),
-            arguments: [tx.object(this.objects.uln302), asObject(tx, verification), call],
+            arguments: [
+                asObject(tx, verification),
+                asObject(tx, dvn),
+                asBytes(tx, packetHeader),
+                asBytes32(tx, payloadHash, this.moduleManager.getUtils()),
+                asU64(tx, confirmations),
+            ],
         })
     }
 

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