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

package/dist/index.cjs

@@ -23,10 +23,6 @@ var DvnDstConfigBcs = bcs.bcs.struct("DstConfig", {
   multiplier_bps: bcs.bcs.U16,
   floor_margin_usd: bcs.bcs.U128
 });
-var TimeoutBcs = bcs.bcs.struct("Timeout", {
-  expiry: bcs.bcs.U64,
-  fallback_lib: bcs.bcs.Address
-});
 var Bytes32Bcs = bcs.bcs.struct("Bytes32", {
   bytes: bcs.bcs.vector(bcs.bcs.u8())
 });
@@ -72,16 +68,6 @@ var MoveCallBCS = bcs.bcs.struct("MoveCall", {
   result_ids: bcs.bcs.vector(bcs.bcs.vector(bcs.bcs.u8()))
 });
 var VectorMoveCallBCS = bcs.bcs.vector(MoveCallBCS);
-var OAppInfoV1Bcs = bcs.bcs.struct("OAppInfoV1", {
-  // Object ID address of the OApp instance
-  oapp_object: bcs.bcs.Address,
-  // Used to populate the MoveCalls to fetch the next nonce that can be executed by an executor
-  next_nonce_info: bcs.bcs.vector(bcs.bcs.u8()),
-  // Used to populate the MoveCalls to execute lz_receive by executor
-  lz_receive_info: bcs.bcs.vector(bcs.bcs.u8()),
-  // Additional configuration data for custom OApp functionality
-  extra_info: bcs.bcs.vector(bcs.bcs.u8())
-});
 var PriceBcs = bcs.bcs.struct("Price", {
   price_ratio: bcs.bcs.U128,
   gas_price_in_unit: bcs.bcs.U64,
@@ -108,6 +94,10 @@ var OAppUlnConfigBcs = bcs.bcs.struct("OAppUlnConfig", {
   use_default_optional_dvns: bcs.bcs.Bool,
   uln_config: UlnConfigBcs
 });
+var TimeoutBcs = bcs.bcs.struct("Timeout", {
+  expiry: bcs.bcs.U64,
+  fallback_lib: bcs.bcs.Address
+});
 
 // src/types/modules.ts
 var Modules = /* @__PURE__ */ ((Modules2) => {
@@ -137,7 +127,6 @@ var Modules = /* @__PURE__ */ ((Modules2) => {
   Modules2["Counter"] = "counter";
   Modules2["DvnPtbBuilder"] = "dvnPtbBuilder";
   Modules2["ExecutorPtbBuilder"] = "executorPtbBuilder";
-  Modules2["WorkerRegistry"] = "workerRegistry";
   return Modules2;
 })(Modules || {});
 
@@ -227,7 +216,6 @@ var UlnVerificationState = {
 };
 
 // src/types/endpoint.ts
-var OAppInfoVersion = { VERSION_1: 1, VERSION_2: 2 };
 var LzReceiveVersion = { VERSION_1: 1 };
 var LzComposeVersion = { VERSION_1: 1 };
 function isTransactionArgument(value) {
@@ -369,7 +357,7 @@ async function validateTransaction(client, signer, tx) {
 }
 async function executeSimulate(client, moveCallFn, parser) {
   const tx = new transactions.Transaction();
-  await moveCallFn(tx);
+  moveCallFn(tx);
   const result = await simulateTransaction(client, tx);
   return parser(result);
 }
@@ -767,24 +755,17 @@ var EndpointErrorCode = {
   MessagingChannel_EPayloadHashNotFound: 9,
   MessagingChannel_ESendReentrancy: 10,
   MessagingChannel_EUninitializedChannel: 11,
-  // MessagingComposer related errors (with MessagingComposer_ prefix)
-  MessagingComposer_EComposeExists: 1,
-  MessagingComposer_EComposeMessageMismatch: 2,
-  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_EInvalidOriginalPackage: 2,
+  OAppRegistry_EOAppNotRegistered: 3,
+  OAppRegistry_EOAppRegistered: 4,
   // Endpoint related errors (with Endpoint_ prefix)
   Endpoint_EAlreadyInitialized: 1,
   Endpoint_EInvalidEid: 2,
   Endpoint_ENotInitialized: 3,
   Endpoint_ERefundAddressNotFound: 4,
-  Endpoint_EUnauthorizedOApp: 5,
-  Endpoint_EUnauthorizedSendLibrary: 6
+  Endpoint_EUnauthorizedSendLibrary: 5
 };
 var _Endpoint_instances, addRequiredValidators_fn, target_fn;
 var Endpoint = class {
@@ -2741,10 +2722,9 @@ target_fn2 = function(name, module_name = MODULE_NAME2) {
 };
 var MODULE_NAME3 = "simple_message_lib";
 var SimpleMessageLibErrorCode = {
-  // SimpleMessageLib related errors (matching simple_message_lib.move)
-  SimpleMessageLib_ENotImplemented: 1,
-  SimpleMessageLib_EZROFeeNotEnabled: 2,
-  SimpleMessageLib_EInvalidEid: 3
+  // SimpleMessageLib related errors (with SimpleMessageLib_ prefix)
+  SimpleMessageLib_EConfigNotFound: 1,
+  SimpleMessageLib_EZROFeeNotEnabled: 2
 };
 var _SimpleMessageLib_instances, target_fn3;
 var SimpleMessageLib = class {
@@ -2975,25 +2955,10 @@ var Uln302ErrorCode = {
   ReceiveUln302_EInvalidEid: 3,
   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
 };
 var _Uln302_instances, target_fn4;
 var Uln302 = class {
@@ -3091,16 +3056,25 @@ var Uln302 = class {
     });
   }
   /**
-   * 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, verification, call) {
+  verifyMoveCall(tx, verification, dvn, packetHeader, payloadHash, confirmations) {
     tx.moveCall({
       target: __privateMethod(this, _Uln302_instances, target_fn4).call(this, "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)
+      ]
     });
   }
   /**
@@ -3653,22 +3627,9 @@ var DVNErrorCode = {
   DVN_EExpiredSignature: 1,
   DVN_EEidNotSupported: 2,
   DVN_EHashAlreadyUsed: 3,
-  DVN_EPtbBuilderAlreadyInitialized: 4,
-  // Multisig related errors (matching multisig.move)
-  Multisig_EDuplicatedSigner: 1,
-  Multisig_EInvalidSignatureLength: 2,
-  Multisig_EInvalidSignerLength: 3,
-  Multisig_EQuorumIsZero: 4,
-  Multisig_ESignaturesLessThanQuorum: 5,
-  Multisig_ESignerAlreadyExists: 6,
-  Multisig_ESignerNotFound: 7,
-  Multisig_ESignerNotInCommittee: 8,
-  Multisig_ESignersSizeIsLessThanQuorum: 9,
-  // DVNInfoV1 related errors (matching dvn_info_v1.move)
-  DVNInfoV1_EInvalidData: 1,
-  DVNInfoV1_EInvalidVersion: 2
-};
-var _DVN_instances, getUlnObjectAddress_fn, getUlnVerifyTarget_fn, target_fn5;
+  DVN_EPtbBuilderAlreadyInitialized: 4
+};
+var _DVN_instances, target_fn5;
 var DVN = class {
   constructor(packageId, client, objects, moduleManager) {
     this.moduleManager = moduleManager;
@@ -3831,29 +3792,6 @@ var DVN = class {
     });
   }
   // === Set Functions with Signatures ===
-  /**
-   * Set supported message library (admin with signatures)
-   * @param tx - The transaction to add the move call to
-   * @param adminCap - The admin capability object ID
-   * @param messageLib - The message library address
-   * @param supported - Whether to support or remove support for the message library
-   * @param expiration - Signature expiration timestamp
-   * @param signatures - Multisig signatures for authorization
-   */
-  setSupportedMessageLibMoveCall(tx, adminCap, messageLib, supported, expiration, signatures) {
-    tx.moveCall({
-      target: __privateMethod(this, _DVN_instances, target_fn5).call(this, "set_supported_message_lib"),
-      arguments: [
-        tx.object(this.objects.dvn),
-        asObject(tx, adminCap),
-        asAddress(tx, messageLib),
-        asBool(tx, supported),
-        asU64(tx, expiration),
-        asBytes(tx, signatures),
-        tx.object.clock()
-      ]
-    });
-  }
   /**
    * Set allowlist status for an OApp sender (admin with signatures)
    * @param tx - The transaction to add the move call to
@@ -3988,24 +3926,23 @@ var DVN = class {
   }
   // Verification Functions
   /**
-   * Verify a packet with DVN signatures (admin with signatures) - returns Call object for ULN302
+   * Verify a packet with DVN signatures (admin with signatures)
    * @param tx - The transaction to add the move call to
    * @param adminCap - The admin capability object ID
-   * @param targetMessageLib - The target message library address (usually ULN302)
+   * @param verification - The verification object address
    * @param packetHeader - The packet header as bytes
    * @param payloadHash - The payload hash as bytes
    * @param confirmations - Required confirmations count
    * @param expiration - Signature expiration timestamp
    * @param signatures - DVN multisig signatures
-   * @returns Transaction result containing the verification Call object
    */
-  verifyMoveCall(tx, adminCap, targetMessageLib, packetHeader, payloadHash, confirmations, expiration, signatures) {
-    return tx.moveCall({
+  verifyMoveCall(tx, adminCap, verification, packetHeader, payloadHash, confirmations, expiration, signatures) {
+    tx.moveCall({
       target: __privateMethod(this, _DVN_instances, target_fn5).call(this, "verify"),
       arguments: [
         tx.object(this.objects.dvn),
         asObject(tx, adminCap),
-        asAddress(tx, targetMessageLib),
+        asObject(tx, verification),
         asBytes(tx, packetHeader),
         asBytes32(tx, payloadHash, this.moduleManager.getUtils()),
         asU64(tx, confirmations),
@@ -4275,32 +4212,6 @@ var DVN = class {
       (result) => bcs.bcs.Bool.parse(result[0].value)
     );
   }
-  /**
-   * Check if a message library is supported by this DVN
-   * @param tx - The transaction to add the move call to
-   * @param messageLib - The message library address to check
-   * @returns Transaction result containing the support status
-   */
-  isSupportedMessageLibMoveCall(tx, messageLib) {
-    return tx.moveCall({
-      target: __privateMethod(this, _DVN_instances, target_fn5).call(this, "is_supported_message_lib"),
-      arguments: [tx.object(this.objects.dvn), asAddress(tx, messageLib)]
-    });
-  }
-  /**
-   * Check if a message library is supported by this DVN
-   * @param messageLib - The message library address to check
-   * @returns Promise<boolean> - True if the message library is supported
-   */
-  async isSupportedMessageLib(messageLib) {
-    return executeSimulate(
-      this.client,
-      (tx) => {
-        this.isSupportedMessageLibMoveCall(tx, messageLib);
-      },
-      (result) => bcs.bcs.Bool.parse(result[0].value)
-    );
-  }
   /**
    * Check if an address is allowlisted
    * @param tx - The transaction to add the move call to
@@ -4653,49 +4564,6 @@ var DVN = class {
       (result) => bcs.bcs.Bool.parse(result[0].value)
     );
   }
-  /**
-   * Get DVN object address from worker registry using this DVN's worker capability (as a move call)
-   * This function chains Move calls to decode worker info and extract the DVN object address
-   * @param tx - The transaction to add the move call to
-   * @returns Transaction result containing the DVN object address
-   */
-  getDvnObjectAddressMoveCall(tx) {
-    const workerCapAddress = this.workerCapAddressMoveCall(tx);
-    const workerInfoBytes = this.moduleManager.getWorkerRegistry(this.client).getWorkerInfoMoveCall(tx, workerCapAddress);
-    const workerInfo = tx.moveCall({
-      target: `${this.moduleManager.packages.workerCommon}::worker_info_v1::decode`,
-      arguments: [workerInfoBytes]
-    });
-    const dvnInfoBytes = tx.moveCall({
-      target: `${this.moduleManager.packages.workerCommon}::worker_info_v1::worker_info`,
-      arguments: [workerInfo]
-    });
-    const dvnInfo = tx.moveCall({
-      target: `${this.packageId}::dvn_info_v1::decode`,
-      arguments: [dvnInfoBytes]
-    });
-    return tx.moveCall({
-      target: `${this.packageId}::dvn_info_v1::dvn_object`,
-      arguments: [dvnInfo]
-    });
-  }
-  /**
-   * Get DVN object address from worker registry using this DVN's worker capability
-   * This function uses Move calls to decode worker info and extract the DVN object address
-   * @returns Promise<string> - The DVN object address
-   * @throws Will throw an error if worker info is not found or if decoding fails
-   */
-  async getDvnObjectAddress() {
-    return executeSimulate(
-      this.client,
-      (tx) => {
-        this.getDvnObjectAddressMoveCall(tx);
-      },
-      (result) => {
-        return bcs.bcs.Address.parse(result[0].value);
-      }
-    );
-  }
   // === Witness Functions ===
   /**
    * Create a LayerZero witness for DVN package whitelist registration
@@ -4983,63 +4851,8 @@ var DVN = class {
       ]
     });
   }
-  /**
-   * Populate verify with DVN verification and ULN verify call
-   * @param tx - The transaction to add the move call to
-   * @param adminCap - The admin capability object ID
-   * @param targetMessageLib - The target message library address (usually ULN302)
-   * @param targetVerification - The verification object address for the target message library
-   * @param packetHeader - The packet header as bytes
-   * @param payloadHash - The payload hash as bytes
-   * @param confirmations - Required confirmations count
-   * @param expiration - Signature expiration timestamp
-   * @param signatures - DVN multisig signatures
-   */
-  populateVerify(tx, adminCap, targetMessageLib, targetVerification, packetHeader, payloadHash, confirmations, expiration, signatures) {
-    const dvnCall = this.verifyMoveCall(
-      tx,
-      adminCap,
-      targetMessageLib,
-      packetHeader,
-      payloadHash,
-      confirmations,
-      expiration,
-      signatures
-    );
-    const messageLibObjectAddress = __privateMethod(this, _DVN_instances, getUlnObjectAddress_fn).call(this, targetMessageLib);
-    tx.moveCall({
-      target: __privateMethod(this, _DVN_instances, getUlnVerifyTarget_fn).call(this, targetMessageLib),
-      arguments: [tx.object(messageLibObjectAddress), asObject(tx, targetVerification), dvnCall]
-    });
-  }
 };
 _DVN_instances = new WeakSet();
-/**
- * Get message library object address based on targetMessageLib package address
- * @param targetMessageLib - The target message library package address
- * @returns Message library object address
- * @throws Error if targetMessageLib doesn't match any known message library
- * @private
- */
-getUlnObjectAddress_fn = function(targetMessageLib) {
-  if (targetMessageLib === this.moduleManager.packages.uln302) {
-    return this.objects.uln302;
-  }
-  throw new Error("Target message library not match objects");
-};
-/**
- * Get ULN verify target path based on targetMessageLib package address
- * @param targetMessageLib - The target message library package address
- * @returns Message library verify target path
- * @throws Error if targetMessageLib doesn't match any known message library
- * @private
- */
-getUlnVerifyTarget_fn = function(targetMessageLib) {
-  if (targetMessageLib === this.moduleManager.packages.uln302) {
-    return `${targetMessageLib}::uln_302::verify`;
-  }
-  throw new Error("Target message library not match any target");
-};
 /**
  * Generate the full target path for move calls
  * @param name - The function name to call
@@ -5124,10 +4937,6 @@ target_fn6 = function(name, module_name = MODULE_NAME6) {
 
 // src/modules/workers/dvn-layerzero.ts
 var MODULE_NAME7 = "dvn_layerzero";
-var DVNLayerzeroErrorCode = {
-  // DVNLayerzero related errors (matching dvn_layerzero.move)
-  DVNLayerzero_EWorkerCapNotFromPackage: 1
-};
 var _DvnLayerZero_instances, target_fn7;
 var DvnLayerZero = class {
   constructor(packageId, client, moduleManager) {
@@ -5144,7 +4953,6 @@ var DvnLayerZero = class {
    * @param workerCap - Worker capability object ID or transaction argument
    * @param vid - Verifier ID for the DVN or transaction argument
    * @param depositAddress - Address for fee deposits or transaction argument
-   * @param supportedMessageLibs - Array of supported message library addresses or transaction argument
    * @param priceFeed - Price feed object address or transaction argument
    * @param workerFeeLib - Worker fee library address or transaction argument
    * @param defaultMultiplierBps - Default multiplier in basis points or transaction argument
@@ -5152,21 +4960,19 @@ var DvnLayerZero = class {
    * @param signers - Array of signer public keys as bytes or transaction argument
    * @param quorum - Required signature threshold or transaction argument
    */
-  initDvnMoveCall(tx, workerCap, vid, depositAddress, supportedMessageLibs, priceFeed, workerFeeLib, defaultMultiplierBps, admins, signers, quorum) {
+  initDvnMoveCall(tx, workerCap, vid, depositAddress, priceFeed, workerFeeLib, defaultMultiplierBps, admins, signers, quorum) {
     tx.moveCall({
       target: __privateMethod(this, _DvnLayerZero_instances, target_fn7).call(this, "init_dvn"),
       arguments: [
         asObject(tx, workerCap),
         asU32(tx, vid),
         asAddress(tx, depositAddress),
-        asAddressVector(tx, supportedMessageLibs),
         asAddress(tx, priceFeed),
         asAddress(tx, workerFeeLib),
         asU16(tx, defaultMultiplierBps),
         asAddressVector(tx, admins),
         asBytesVector(tx, signers),
-        asU64(tx, quorum),
-        tx.object(this.moduleManager.objects.workerRegistry)
+        asU64(tx, quorum)
       ]
     });
   }
@@ -5186,10 +4992,7 @@ var MODULE_NAME8 = "executor_worker";
 var ExecutorErrorCode = {
   // Executor related errors (with Executor_ prefix)
   Executor_EEidNotSupported: 1,
-  Executor_EInvalidNativeDropAmount: 2,
-  // ExecutorInfoV1 related errors (matching executor_info_v1.move)
-  ExecutorInfoV1_EInvalidData: 1,
-  ExecutorInfoV1_EInvalidVersion: 2
+  Executor_EInvalidNativeDropAmount: 2
 };
 var _Executor_instances, target_fn8;
 var Executor = class {
@@ -5561,24 +5364,6 @@ var Executor = class {
       ]
     });
   }
-  /**
-   * Set supported message library (owner only)
-   * @param tx - The transaction to add the move call to
-   * @param ownerCap - The owner capability object ID
-   * @param messageLib - The message library address
-   * @param supported - Whether to support or remove support for the message library
-   */
-  setSupportedMessageLibMoveCall(tx, ownerCap, messageLib, supported) {
-    tx.moveCall({
-      target: __privateMethod(this, _Executor_instances, target_fn8).call(this, "set_supported_message_lib"),
-      arguments: [
-        tx.object(this.objects.executor),
-        asObject(tx, ownerCap),
-        asAddress(tx, messageLib),
-        asBool(tx, supported)
-      ]
-    });
-  }
   /**
    * Set allowlist status for an OApp sender (owner only)
    * @param tx - The transaction to add the move call to
@@ -5831,32 +5616,6 @@ var Executor = class {
       (result) => bcs.bcs.Bool.parse(result[0].value)
     );
   }
-  /**
-   * Check if a message library is supported by this executor
-   * @param tx - The transaction to add the move call to
-   * @param messageLib - The message library address to check
-   * @returns Transaction result containing the support status
-   */
-  isSupportedMessageLibMoveCall(tx, messageLib) {
-    return tx.moveCall({
-      target: __privateMethod(this, _Executor_instances, target_fn8).call(this, "is_supported_message_lib"),
-      arguments: [tx.object(this.objects.executor), asAddress(tx, messageLib)]
-    });
-  }
-  /**
-   * Check if a message library is supported by this executor
-   * @param messageLib - The message library address to check
-   * @returns Promise<boolean> - True if the message library is supported
-   */
-  async isSupportedMessageLib(messageLib) {
-    return executeSimulate(
-      this.client,
-      (tx) => {
-        this.isSupportedMessageLibMoveCall(tx, messageLib);
-      },
-      (result) => bcs.bcs.Bool.parse(result[0].value)
-    );
-  }
   /**
    * Check if an address is allowlisted
    * @param tx - The transaction to add the move call to
@@ -6060,49 +5819,6 @@ var Executor = class {
       (result) => bcs.bcs.Address.parse(result[0].value)
     );
   }
-  /**
-   * Get Executor object address from worker registry using this Executor's worker capability (as a move call)
-   * This function chains Move calls to decode worker info and extract the Executor object address
-   * @param tx - The transaction to add the move call to
-   * @returns Transaction result containing the Executor object address
-   */
-  getExecutorObjectAddressMoveCall(tx) {
-    const workerCapAddress = this.workerCapAddressMoveCall(tx);
-    const workerInfoBytes = this.moduleManager.getWorkerRegistry(this.client).getWorkerInfoMoveCall(tx, workerCapAddress);
-    const workerInfo = tx.moveCall({
-      target: `${this.moduleManager.packages.workerCommon}::worker_info_v1::decode`,
-      arguments: [workerInfoBytes]
-    });
-    const executorInfoBytes = tx.moveCall({
-      target: `${this.moduleManager.packages.workerCommon}::worker_info_v1::worker_info`,
-      arguments: [workerInfo]
-    });
-    const executorInfo = tx.moveCall({
-      target: `${this.packageId}::executor_info_v1::decode`,
-      arguments: [executorInfoBytes]
-    });
-    return tx.moveCall({
-      target: `${this.packageId}::executor_info_v1::executor_object`,
-      arguments: [executorInfo]
-    });
-  }
-  /**
-   * Get Executor object address from worker registry using this Executor's worker capability
-   * This function uses Move calls to decode worker info and extract the Executor object address
-   * @returns Promise<string> - The Executor object address
-   * @throws Will throw an error if worker info is not found or if decoding fails
-   */
-  async getExecutorObjectAddress() {
-    return executeSimulate(
-      this.client,
-      (tx) => {
-        this.getExecutorObjectAddressMoveCall(tx);
-      },
-      (result) => {
-        return bcs.bcs.Address.parse(result[0].value);
-      }
-    );
-  }
   // === Private Helper Functions ===
   parseDstConfig(data) {
     const config = DstConfigBcs.parse(data);
@@ -6130,17 +5846,10 @@ target_fn8 = function(name, module_name = MODULE_NAME8) {
 // src/modules/workers/executor-fee-lib.ts
 var MODULE_NAME9 = "executor_fee_lib";
 var ExecutorFeeLibErrorCode = {
-  // Executor Fee Lib related errors (matching executor_fee_lib.move)
+  // Executor Fee Lib related errors (with ExecutorFeeLib_ prefix)
   ExecutorFeeLib_EEidNotSupported: 1,
-  // ExecutorOption related errors (matching executor_option.move)
-  ExecutorOption_ENoOptions: 1,
-  ExecutorOption_EUnsupportedOptionType: 2,
-  ExecutorOption_EZeroLzReceiveGasProvided: 3,
-  ExecutorOption_EZeroLzComposeGasProvided: 4,
-  ExecutorOption_ENativeAmountExceedsCap: 5,
-  ExecutorOption_EInvalidLzReceiveOption: 6,
-  ExecutorOption_EInvalidNativeDropOption: 7,
-  ExecutorOption_EInvalidLzComposeOption: 8
+  ExecutorFeeLib_EInvalidExecutor: 2,
+  ExecutorFeeLib_EExecutorAlreadySet: 3
 };
 var _ExecutorFeeLib_instances, target_fn9;
 var ExecutorFeeLib = class {
@@ -6205,10 +5914,6 @@ target_fn9 = function(name, module_name = MODULE_NAME9) {
 
 // src/modules/workers/executor-layerzero.ts
 var MODULE_NAME10 = "executor_layerzero";
-var ExecutorLayerzeroErrorCode = {
-  // ExecutorLayerzero related errors (matching executor_layerzero.move)
-  ExecutorLayerzero_EWorkerCapNotFromPackage: 1
-};
 var _ExecutorLayerZero_instances, target_fn10;
 var ExecutorLayerZero = class {
   constructor(packageId, client, moduleManager) {
@@ -6224,26 +5929,23 @@ var ExecutorLayerZero = class {
    * @param tx - The transaction to add the move call to
    * @param workerCap - Worker capability object ID or transaction argument
    * @param depositAddress - Address for fee deposits or transaction argument
-   * @param supportedMessageLibs - Array of supported message library addresses or transaction argument
    * @param priceFeed - Price feed object address or transaction argument
    * @param workerFeeLib - Worker fee library address or transaction argument
    * @param defaultMultiplierBps - Default multiplier in basis points or transaction argument
    * @param owner - Owner address for the executor or transaction argument
    * @param admins - Array of admin addresses or transaction argument
    */
-  initExecutorMoveCall(tx, workerCap, depositAddress, supportedMessageLibs, priceFeed, workerFeeLib, defaultMultiplierBps, owner, admins) {
+  initExecutorMoveCall(tx, workerCap, depositAddress, priceFeed, workerFeeLib, defaultMultiplierBps, owner, admins) {
     tx.moveCall({
       target: __privateMethod(this, _ExecutorLayerZero_instances, target_fn10).call(this, "init_executor"),
       arguments: [
         asObject(tx, workerCap),
         asAddress(tx, depositAddress),
-        asAddressVector(tx, supportedMessageLibs),
         asAddress(tx, priceFeed),
         asAddress(tx, workerFeeLib),
         asU16(tx, defaultMultiplierBps),
         asAddress(tx, owner),
-        asAddressVector(tx, admins),
-        tx.object(this.moduleManager.objects.workerRegistry)
+        asAddressVector(tx, admins)
       ]
     });
   }
@@ -6740,10 +6442,10 @@ target_fn11 = function(name, module_name = MODULE_NAME11) {
 };
 var MODULE_NAME12 = "treasury";
 var TreasuryErrorCode = {
-  // Treasury related errors (matching treasury.move)
-  TREASURY_EInvalidFeeRecipient: 1,
-  TREASURY_EInvalidNativeFeeBp: 2,
-  TREASURY_EZroNotEnabled: 3
+  // Treasury related errors
+  TREASURY_EZroNotEnabled: 1,
+  TREASURY_EInvalidFeeRecipient: 2,
+  TREASURY_EInvalidNativeFeeBp: 3
 };
 var _Treasury_instances, target_fn12;
 var Treasury = class {
@@ -6993,95 +6695,9 @@ target_fn12 = function(name, module_name = MODULE_NAME12) {
   return `${this.packageId}::${module_name}::${name}`;
 };
 
-// src/modules/workers/worker-registry.ts
-var MODULE_NAME13 = "worker_registry";
-var WorkerRegistryErrorCode = {
-  // WorkerRegistry related errors (matching worker_registry.move)
-  EWorkerInfoInvalid: 1,
-  EWorkerInfoNotFound: 2
-};
-var _WorkerRegistry_instances, target_fn13;
-var WorkerRegistry = class {
-  /**
-   * Create a new WorkerRegistry instance
-   * @param packageId - The package ID of the worker registry contract
-   * @param client - The Sui client instance
-   * @param objects - Object options containing contract object IDs
-   * @param moduleManager - Module manager for handling dependencies
-   */
-  constructor(packageId, client, objects, moduleManager) {
-    this.moduleManager = moduleManager;
-    __privateAdd(this, _WorkerRegistry_instances);
-    this.packageId = packageId;
-    this.client = client;
-    this.objects = objects;
-  }
-  // === View Functions ===
-  /**
-   * Get worker info for a specific worker address (as a move call)
-   * This creates a move call that can be used in a PTB (Programmable Transaction Block)
-   * @param tx - The transaction to add the move call to
-   * @param worker - The worker address or transaction argument
-   * @returns TransactionResult - The move call result containing worker info bytes
-   * @throws Will throw an error if worker info is not found (EWorkerInfoNotFound)
-   */
-  getWorkerInfoMoveCall(tx, worker) {
-    return tx.moveCall({
-      target: __privateMethod(this, _WorkerRegistry_instances, target_fn13).call(this, "get_worker_info"),
-      arguments: [tx.object(this.objects.workerRegistry), asAddress(tx, worker)]
-    });
-  }
-  /**
-   * Get worker info for a specific worker address
-   * Executes the get_worker_info function and returns the worker information bytes
-   * @param worker - The worker address to get info for
-   * @returns Promise<Uint8Array> - The worker information bytes containing encoded worker data
-   * @throws Will throw an error if worker info is not found (EWorkerInfoNotFound)
-   */
-  async getWorkerInfo(worker) {
-    return executeSimulate(
-      this.client,
-      (tx) => {
-        this.getWorkerInfoMoveCall(tx, worker);
-      },
-      (result) => {
-        return result[0].value;
-      }
-    );
-  }
-  /**
-   * Check if worker info exists for a specific worker address
-   * This is a convenience method that catches EWorkerInfoNotFound errors
-   * @param worker - The worker address to check
-   * @returns Promise<boolean> - True if worker info exists, false if not found
-   * @throws Will re-throw any errors other than EWorkerInfoNotFound
-   */
-  async hasWorkerInfo(worker) {
-    try {
-      await this.getWorkerInfo(worker);
-      return true;
-    } catch (error) {
-      if (error instanceof Error && error.message.includes("EWorkerInfoNotFound")) {
-        return false;
-      }
-      throw error;
-    }
-  }
-};
-_WorkerRegistry_instances = new WeakSet();
-// === Private Functions ===
-/**
- * Generate the target string for move calls
- * @param functionName - The function name to call
- * @returns The fully qualified target string for the move call
- */
-target_fn13 = function(functionName) {
-  return `${this.packageId}::${MODULE_NAME13}::${functionName}`;
-};
-
 // src/modules/ptb-builders/dvn-ptb-builder.ts
-var MODULE_NAME14 = "dvn_ptb_builder";
-var _DvnPtbBuilder_instances, target_fn14;
+var MODULE_NAME13 = "dvn_ptb_builder";
+var _DvnPtbBuilder_instances, target_fn13;
 var DvnPtbBuilder = class {
   constructor(packageId, client, objects, moduleManager) {
     this.moduleManager = moduleManager;
@@ -7101,7 +6717,7 @@ var DvnPtbBuilder = class {
    */
   buildDvnPtbMoveCall(tx, dvnAddress, feelibAddress, priceFeedAddress) {
     return tx.moveCall({
-      target: __privateMethod(this, _DvnPtbBuilder_instances, target_fn14).call(this, "build_dvn_ptb"),
+      target: __privateMethod(this, _DvnPtbBuilder_instances, target_fn13).call(this, "build_dvn_ptb"),
       arguments: [asObject(tx, dvnAddress), asObject(tx, feelibAddress), asObject(tx, priceFeedAddress)]
     });
   }
@@ -7114,21 +6730,15 @@ _DvnPtbBuilder_instances = new WeakSet();
  * @returns The full module path for the move call
  * @private
  */
-target_fn14 = function(name, module_name = MODULE_NAME14) {
+target_fn13 = function(name, module_name = MODULE_NAME13) {
   return `${this.packageId}::${module_name}::${name}`;
 };
-var EndpointPtbBuilderErrorCode = {
-  // EndpointPtbBuilder related errors (matching endpoint_ptb_builder.move)
-  EndpointPtbBuilder_EBuilderNotFound: 1,
-  EndpointPtbBuilder_EBuilderRegistered: 2,
-  EndpointPtbBuilder_EBuilderUnsupported: 3,
-  EndpointPtbBuilder_EInvalidBounds: 4,
-  EndpointPtbBuilder_EInvalidBuilderAddress: 5,
-  EndpointPtbBuilder_EInvalidLibrary: 6,
-  EndpointPtbBuilder_EUnauthorized: 7
+var LibBuilderManagerErrorCode = {
+  // LibBuilderManager related errors (with LibBuilderManager_ prefix)
+  LibBuilderManager_EBuilderNotFound: 1
 };
 var ModuleName = "endpoint_ptb_builder";
-var _EndpointPtbBuilder_instances, target_fn15;
+var _EndpointPtbBuilder_instances, target_fn14;
 var EndpointPtbBuilder = class {
   constructor(packageId, client, objects, moduleManager) {
     this.moduleManager = moduleManager;
@@ -7145,7 +6755,7 @@ var EndpointPtbBuilder = class {
    */
   registerMsglibPtbBuilderMoveCall(tx, builderInfo) {
     tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "register_msglib_ptb_builder"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "register_msglib_ptb_builder"),
       arguments: [
         tx.object(this.objects.endpointPtbBuilder),
         tx.object(this.objects.endpointPtbBuilderAdminCap),
@@ -7162,7 +6772,7 @@ var EndpointPtbBuilder = class {
    */
   setDefaultMsglibPtbBuilderMoveCall(tx, messageLib, ptbBuilder) {
     tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "set_default_msglib_ptb_builder"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "set_default_msglib_ptb_builder"),
       arguments: [
         tx.object(this.objects.endpointPtbBuilder),
         tx.object(this.objects.endpointPtbBuilderAdminCap),
@@ -7178,7 +6788,7 @@ var EndpointPtbBuilder = class {
    */
   setMsglibPtbBuilderMoveCall(tx, call) {
     tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "set_msglib_ptb_builder"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "set_msglib_ptb_builder"),
       arguments: [tx.object(this.objects.endpointPtbBuilder), call]
     });
   }
@@ -7191,7 +6801,7 @@ var EndpointPtbBuilder = class {
    */
   buildQuotePtbByCallMoveCall(tx, endpointQuoteCall) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "build_quote_ptb_by_call"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "build_quote_ptb_by_call"),
       arguments: [
         tx.object(this.objects.endpointPtbBuilder),
         tx.object(this.objects.endpointV2),
@@ -7207,7 +6817,7 @@ var EndpointPtbBuilder = class {
    */
   buildSendPtbByCallMoveCall(tx, endpointSendCall) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "build_send_ptb_by_call"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "build_send_ptb_by_call"),
       arguments: [
         tx.object(this.objects.endpointPtbBuilder),
         tx.object(this.objects.endpointV2),
@@ -7223,7 +6833,7 @@ var EndpointPtbBuilder = class {
    */
   buildSetConfigPtbByCallMoveCall(tx, messageLibSetConfigCall) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "build_set_config_ptb_by_call"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "build_set_config_ptb_by_call"),
       arguments: [tx.object(this.objects.endpointPtbBuilder), messageLibSetConfigCall]
     });
   }
@@ -7236,7 +6846,7 @@ var EndpointPtbBuilder = class {
    */
   buildQuotePtbMoveCall(tx, sender, dstEid) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "build_quote_ptb"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "build_quote_ptb"),
       arguments: [
         tx.object(this.objects.endpointPtbBuilder),
         tx.object(this.objects.endpointV2),
@@ -7255,7 +6865,7 @@ var EndpointPtbBuilder = class {
    */
   buildSendPtbMoveCall(tx, sender, dstEid, refund) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "build_send_ptb"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "build_send_ptb"),
       arguments: [
         tx.object(this.objects.endpointPtbBuilder),
         tx.object(this.objects.endpointV2),
@@ -7274,7 +6884,7 @@ var EndpointPtbBuilder = class {
    */
   buildSetConfigPtbMoveCall(tx, sender, lib) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "build_set_config_ptb"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "build_set_config_ptb"),
       arguments: [
         tx.object(this.objects.endpointPtbBuilder),
         tx.object(this.objects.endpointV2),
@@ -7291,7 +6901,7 @@ var EndpointPtbBuilder = class {
    */
   endpointQuoteCallIdMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "endpoint_quote_call_id"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "endpoint_quote_call_id"),
       arguments: []
     });
   }
@@ -7315,7 +6925,7 @@ var EndpointPtbBuilder = class {
    */
   endpointSendCallIdMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "endpoint_send_call_id"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "endpoint_send_call_id"),
       arguments: []
     });
   }
@@ -7339,7 +6949,7 @@ var EndpointPtbBuilder = class {
    */
   messageLibQuoteCallIdMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "message_lib_quote_call_id"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "message_lib_quote_call_id"),
       arguments: []
     });
   }
@@ -7363,7 +6973,7 @@ var EndpointPtbBuilder = class {
    */
   messageLibSendCallIdMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "message_lib_send_call_id"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "message_lib_send_call_id"),
       arguments: []
     });
   }
@@ -7387,7 +6997,7 @@ var EndpointPtbBuilder = class {
    */
   messageLibSetConfigCallIdMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "message_lib_set_config_call_id"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "message_lib_set_config_call_id"),
       arguments: []
     });
   }
@@ -7413,7 +7023,7 @@ var EndpointPtbBuilder = class {
    */
   getDefaultMsglibPtbBuilderMoveCall(tx, lib) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "get_default_msglib_ptb_builder"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "get_default_msglib_ptb_builder"),
       arguments: [tx.object(this.objects.endpointPtbBuilder), asAddress(tx, lib)]
     });
   }
@@ -7440,7 +7050,7 @@ var EndpointPtbBuilder = class {
    */
   getOappMsglibPtbBuilderMoveCall(tx, oapp, lib) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "get_oapp_msglib_ptb_builder"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "get_oapp_msglib_ptb_builder"),
       arguments: [tx.object(this.objects.endpointPtbBuilder), asAddress(tx, oapp), asAddress(tx, lib)]
     });
   }
@@ -7468,7 +7078,7 @@ var EndpointPtbBuilder = class {
    */
   getEffectiveMsglibPtbBuilderMoveCall(tx, oapp, lib) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "get_effective_msglib_ptb_builder"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "get_effective_msglib_ptb_builder"),
       arguments: [tx.object(this.objects.endpointPtbBuilder), asAddress(tx, oapp), asAddress(tx, lib)]
     });
   }
@@ -7495,7 +7105,7 @@ var EndpointPtbBuilder = class {
    */
   getMsglibPtbBuilderInfoMoveCall(tx, builder) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "get_msglib_ptb_builder_info"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "get_msglib_ptb_builder_info"),
       arguments: [tx.object(this.objects.endpointPtbBuilder), asAddress(tx, builder)]
     });
   }
@@ -7507,7 +7117,7 @@ var EndpointPtbBuilder = class {
    */
   isMsglibPtbBuilderRegisteredMoveCall(tx, builder) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "is_msglib_ptb_builder_registered"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "is_msglib_ptb_builder_registered"),
       arguments: [tx.object(this.objects.endpointPtbBuilder), asAddress(tx, builder)]
     });
   }
@@ -7532,7 +7142,7 @@ var EndpointPtbBuilder = class {
    */
   registeredMsglibPtbBuildersCountMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn15).call(this, "registered_msglib_ptb_builders_count"),
+      target: __privateMethod(this, _EndpointPtbBuilder_instances, target_fn14).call(this, "registered_msglib_ptb_builders_count"),
       arguments: [tx.object(this.objects.endpointPtbBuilder)]
     });
   }
@@ -7558,13 +7168,13 @@ _EndpointPtbBuilder_instances = new WeakSet();
  * @returns The full module path for the move call
  * @private
  */
-target_fn15 = function(name) {
+target_fn14 = function(name) {
   return `${this.packageId}::${ModuleName}::${name}`;
 };
 
 // src/modules/ptb-builders/executor-ptb-builder.ts
-var MODULE_NAME15 = "executor_ptb_builder";
-var _ExecutorPtbBuilder_instances, target_fn16;
+var MODULE_NAME14 = "executor_ptb_builder";
+var _ExecutorPtbBuilder_instances, target_fn15;
 var ExecutorPtbBuilder = class {
   constructor(packageId, client, objects, moduleManager) {
     this.moduleManager = moduleManager;
@@ -7584,7 +7194,7 @@ var ExecutorPtbBuilder = class {
    */
   buildExecutorPtbMoveCall(tx, executorAddress, feelibAddress, priceFeedAddress) {
     return tx.moveCall({
-      target: __privateMethod(this, _ExecutorPtbBuilder_instances, target_fn16).call(this, "build_executor_ptb"),
+      target: __privateMethod(this, _ExecutorPtbBuilder_instances, target_fn15).call(this, "build_executor_ptb"),
       arguments: [asObject(tx, executorAddress), asObject(tx, feelibAddress), asObject(tx, priceFeedAddress)]
     });
   }
@@ -7597,15 +7207,15 @@ _ExecutorPtbBuilder_instances = new WeakSet();
  * @returns The full module path for the move call
  * @private
  */
-target_fn16 = function(name, module_name = MODULE_NAME15) {
+target_fn15 = function(name, module_name = MODULE_NAME14) {
   return `${this.packageId}::${module_name}::${name}`;
 };
-var MODULE_NAME16 = "package_whitelist_validator";
+var MODULE_NAME15 = "package_whitelist_validator";
 var ValidatorErrorCode = {
   // PTB Whitelist related errors
   EInvalidWitness: 1
 };
-var _PackageWhitelistValidator_instances, target_fn17;
+var _PackageWhitelistValidator_instances, target_fn16;
 var PackageWhitelistValidator = class {
   constructor(packageId, client, objects, moduleManager) {
     this.moduleManager = moduleManager;
@@ -7625,7 +7235,7 @@ var PackageWhitelistValidator = class {
    */
   addWhitelistMoveCall(tx, witness, witnessType) {
     tx.moveCall({
-      target: __privateMethod(this, _PackageWhitelistValidator_instances, target_fn17).call(this, "add_whitelist"),
+      target: __privateMethod(this, _PackageWhitelistValidator_instances, target_fn16).call(this, "add_whitelist"),
       typeArguments: [witnessType],
       arguments: [tx.object(this.objects.packageWhitelistValidator), witness]
     });
@@ -7639,7 +7249,7 @@ var PackageWhitelistValidator = class {
    */
   isWhitelistedMoveCall(tx, packageAddress) {
     return tx.moveCall({
-      target: __privateMethod(this, _PackageWhitelistValidator_instances, target_fn17).call(this, "is_whitelisted"),
+      target: __privateMethod(this, _PackageWhitelistValidator_instances, target_fn16).call(this, "is_whitelisted"),
       arguments: [tx.object(this.objects.packageWhitelistValidator), asAddress(tx, packageAddress)]
     });
   }
@@ -7651,7 +7261,7 @@ var PackageWhitelistValidator = class {
    */
   validateMoveCall(tx, packageAddresses) {
     return tx.moveCall({
-      target: __privateMethod(this, _PackageWhitelistValidator_instances, target_fn17).call(this, "validate"),
+      target: __privateMethod(this, _PackageWhitelistValidator_instances, target_fn16).call(this, "validate"),
       arguments: [
         tx.object(this.objects.packageWhitelistValidator),
         tx.pure(bcs.bcs.vector(bcs.bcs.Address).serialize(packageAddresses))
@@ -7712,18 +7322,11 @@ _PackageWhitelistValidator_instances = new WeakSet();
  * @returns The full module path for the move call
  * @private
  */
-target_fn17 = function(name, module_name = MODULE_NAME16) {
+target_fn16 = function(name, module_name = MODULE_NAME15) {
   return `${this.packageId}::${module_name}::${name}`;
 };
 var MOVE_CALL_MODULE_NAME = "move_call";
-var PtbBuilderErrorCode = {
-  // MoveCallsBuilder related errors (matching move_calls_builder.move)
-  MoveCallsBuilder_EInvalidMoveCallResult: 1,
-  MoveCallsBuilder_EResultIDNotFound: 2,
-  // Argument related errors (matching argument.move)
-  Argument_EInvalidArgument: 1
-};
-var _PtbBuilder_instances, buildMoveCalls_fn, appendMoveCall_fn, decodeMoveCalls_fn, decodeMoveCallsFromOAppInfoV1_fn, decodeMoveCallsBytes_fn, calculateOffset_fn;
+var _PtbBuilder_instances, buildMoveCalls_fn, appendMoveCall_fn, decodeMoveCalls_fn, decodeMoveCallsBytes_fn, calculateOffset_fn;
 var PtbBuilder = class {
   constructor(packageId, client) {
     __privateAdd(this, _PtbBuilder_instances);
@@ -7752,8 +7355,8 @@ var PtbBuilder = class {
     const ptbCallsResult = await simulateTransaction(this.client, tx, sender);
     const buffer = Buffer.from(bcs.bcs.vector(bcs.bcs.u8()).parse(ptbCallsResult[0].value));
     const version = buffer.readInt16BE();
-    if (version === OAppInfoVersion.VERSION_1) {
-      return __privateMethod(this, _PtbBuilder_instances, decodeMoveCallsFromOAppInfoV1_fn).call(this, new Uint8Array(buffer.subarray(2)));
+    if (version === LzReceiveVersion.VERSION_1) {
+      return __privateMethod(this, _PtbBuilder_instances, decodeMoveCallsBytes_fn).call(this, new Uint8Array(buffer.subarray(2)));
     }
     throw new Error(`Unknown version: ${version}`);
   }
@@ -7912,10 +7515,6 @@ decodeMoveCalls_fn = function(viewResult) {
   }
   return __privateMethod(this, _PtbBuilder_instances, decodeMoveCallsBytes_fn).call(this, value);
 };
-decodeMoveCallsFromOAppInfoV1_fn = function(bytes) {
-  const oappInfo = OAppInfoV1Bcs.parse(bytes);
-  return __privateMethod(this, _PtbBuilder_instances, decodeMoveCallsBytes_fn).call(this, new Uint8Array(oappInfo.lz_receive_info).subarray(2));
-};
 /**
  * Decode move calls from raw bytes
  * @param bytes - The raw bytes containing encoded move calls
@@ -7969,8 +7568,8 @@ calculateOffset_fn = function(index, baseOffset, placeholderInfos) {
 };
 
 // src/modules/ptb-builders/simple-message-lib-ptb-builder.ts
-var MODULE_NAME17 = "simple_msglib_ptb_builder";
-var _SimpleMessageLibPtbBuilder_instances, target_fn18;
+var MODULE_NAME16 = "simple_msglib_ptb_builder";
+var _SimpleMessageLibPtbBuilder_instances, target_fn17;
 var SimpleMessageLibPtbBuilder = class {
   constructor(packageId, client, objects, moduleManager) {
     this.moduleManager = moduleManager;
@@ -7987,7 +7586,7 @@ var SimpleMessageLibPtbBuilder = class {
    */
   getPtbBuilderInfoMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _SimpleMessageLibPtbBuilder_instances, target_fn18).call(this, "get_ptb_builder_info"),
+      target: __privateMethod(this, _SimpleMessageLibPtbBuilder_instances, target_fn17).call(this, "get_ptb_builder_info"),
       arguments: [
         tx.object(this.objects.simpleMessageLibPtbBuilder),
         tx.object(this.objects.endpointV2),
@@ -8004,15 +7603,11 @@ _SimpleMessageLibPtbBuilder_instances = new WeakSet();
  * @returns The full module path for the move call
  * @private
  */
-target_fn18 = function(name, module_name = MODULE_NAME17) {
+target_fn17 = function(name, module_name = MODULE_NAME16) {
   return `${this.packageId}::${module_name}::${name}`;
 };
-var MODULE_NAME18 = "uln_302_ptb_builder";
-var Uln302PtbBuilderErrorCode = {
-  // ULN302 PTB Builder related errors (matching uln_302_ptb_builder.move)
-  Uln302PtbBuilder_EWorkerPtbsNotFound: 1
-};
-var _Uln302PtbBuilder_instances, target_fn19;
+var MODULE_NAME17 = "uln_302_ptb_builder";
+var _Uln302PtbBuilder_instances, target_fn18;
 var Uln302PtbBuilder = class {
   constructor(packageId, client, objects, moduleManager) {
     this.moduleManager = moduleManager;
@@ -8029,7 +7624,7 @@ var Uln302PtbBuilder = class {
    */
   setWorkerPtbsMoveCall(tx, call) {
     tx.moveCall({
-      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn19).call(this, "set_worker_ptbs"),
+      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn18).call(this, "set_worker_ptbs"),
       arguments: [tx.object(this.objects.uln302PtbBuilder), call]
     });
   }
@@ -8041,7 +7636,7 @@ var Uln302PtbBuilder = class {
    */
   getPtbBuilderInfoMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn19).call(this, "get_ptb_builder_info"),
+      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn18).call(this, "get_ptb_builder_info"),
       arguments: [
         tx.object(this.objects.uln302PtbBuilder),
         tx.object(this.objects.uln302),
@@ -8058,7 +7653,7 @@ var Uln302PtbBuilder = class {
    */
   isWorkerPtbsSetMoveCall(tx, workerCap) {
     return tx.moveCall({
-      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn19).call(this, "is_worker_ptbs_set"),
+      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn18).call(this, "is_worker_ptbs_set"),
       arguments: [tx.object(this.objects.uln302PtbBuilder), asAddress(tx, workerCap)]
     });
   }
@@ -8084,7 +7679,7 @@ var Uln302PtbBuilder = class {
    */
   getWorkerPtbsMoveCall(tx, workerCap) {
     return tx.moveCall({
-      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn19).call(this, "get_worker_ptbs"),
+      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn18).call(this, "get_worker_ptbs"),
       arguments: [tx.object(this.objects.uln302PtbBuilder), asAddress(tx, workerCap)]
     });
   }
@@ -8096,7 +7691,7 @@ var Uln302PtbBuilder = class {
    */
   executorGetFeeCallIdMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn19).call(this, "executor_get_fee_call_id"),
+      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn18).call(this, "executor_get_fee_call_id"),
       arguments: []
     });
   }
@@ -8120,7 +7715,7 @@ var Uln302PtbBuilder = class {
    */
   dvnGetFeeMultiCallIdMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn19).call(this, "dvn_get_fee_multi_call_id"),
+      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn18).call(this, "dvn_get_fee_multi_call_id"),
       arguments: []
     });
   }
@@ -8144,7 +7739,7 @@ var Uln302PtbBuilder = class {
    */
   executorAssignJobCallIdMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn19).call(this, "executor_assign_job_call_id"),
+      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn18).call(this, "executor_assign_job_call_id"),
       arguments: []
     });
   }
@@ -8168,7 +7763,7 @@ var Uln302PtbBuilder = class {
    */
   dvnAssignJobMultiCallIdMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn19).call(this, "dvn_assign_job_multi_call_id"),
+      target: __privateMethod(this, _Uln302PtbBuilder_instances, target_fn18).call(this, "dvn_assign_job_multi_call_id"),
       arguments: []
     });
   }
@@ -8194,13 +7789,13 @@ _Uln302PtbBuilder_instances = new WeakSet();
  * @returns The full module path for the move call
  * @private
  */
-target_fn19 = function(name, module_name = MODULE_NAME18) {
+target_fn18 = function(name, module_name = MODULE_NAME17) {
   return `${this.packageId}::${module_name}::${name}`;
 };
 
 // src/modules/ptb-builders/blocked-message-lib-ptb-builder.ts
-var MODULE_NAME19 = "blocked_msglib_ptb_builder";
-var _BlockedMessageLibPtbBuilder_instances, target_fn20;
+var MODULE_NAME18 = "blocked_msglib_ptb_builder";
+var _BlockedMessageLibPtbBuilder_instances, target_fn19;
 var BlockedMessageLibPtbBuilder = class {
   constructor(packageId, client, objects, moduleManager) {
     this.moduleManager = moduleManager;
@@ -8217,7 +7812,7 @@ var BlockedMessageLibPtbBuilder = class {
    */
   getPtbBuilderInfoMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _BlockedMessageLibPtbBuilder_instances, target_fn20).call(this, "get_ptb_builder_info"),
+      target: __privateMethod(this, _BlockedMessageLibPtbBuilder_instances, target_fn19).call(this, "get_ptb_builder_info"),
       arguments: [tx.object(this.objects.blockedMessageLibPtbBuilder), tx.object(this.objects.blockedMessageLib)]
     });
   }
@@ -8230,22 +7825,22 @@ _BlockedMessageLibPtbBuilder_instances = new WeakSet();
  * @returns The full module path for the move call
  * @private
  */
-target_fn20 = function(name, module_name = MODULE_NAME19) {
+target_fn19 = function(name, module_name = MODULE_NAME18) {
   return `${this.packageId}::${module_name}::${name}`;
 };
-var MODULE_NAME20 = "counter";
+var MODULE_NAME19 = "counter";
 var 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
 };
-var _Counter_instances, target_fn21;
+var _Counter_instances, target_fn20;
 var Counter = class {
   constructor(packageId, client, objects, moduleManager) {
     this.moduleManager = moduleManager;
@@ -8263,7 +7858,7 @@ var Counter = class {
    */
   initCounterMoveCall(tx, lzReceiveInfo, lzComposeInfo) {
     tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "init_counter"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "init_counter"),
       arguments: [
         tx.object(this.objects.counter),
         tx.object(this.objects.counterOapp),
@@ -8282,10 +7877,10 @@ var Counter = class {
    * @param payInZero - Whether to pay in ZRO tokens
    * @returns Promise<MessagingFee> - The calculated messaging fees
    */
-  async quote(dstEid, msgType, options, payInZero, validators) {
+  async quote(dstEid, msgType, options, payInZero) {
     const tx = new transactions.Transaction();
     const quoteCall = tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "quote"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "quote"),
       arguments: [
         tx.object(this.objects.counter),
         tx.object(this.objects.counterOapp),
@@ -8295,7 +7890,7 @@ var Counter = class {
         asBool(tx, payInZero)
       ]
     });
-    return this.moduleManager.getEndpoint().quote(tx, quoteCall, void 0, validators);
+    return this.moduleManager.getEndpoint().quote(tx, quoteCall);
   }
   /**
    * Increment counter on destination chain
@@ -8309,11 +7904,11 @@ var Counter = class {
    * @param zroFee - ZRO token fee amount
    * @param refundAddress - Address for fee refunds
    */
-  async incrementMoveCall(tx, sender, dstEid, msgType, options, sendValue, nativeFee, zroFee, refundAddress, validators) {
+  async incrementMoveCall(tx, sender, dstEid, msgType, options, sendValue, nativeFee, zroFee, refundAddress) {
     const [nativeToken] = tx.splitCoins(tx.gas, [asU64(tx, nativeFee)]);
     const zroToken = isTransactionArgument(zroFee) ? zroFee : await this.moduleManager.getZro().splitOptionZroTokenMoveCall(tx, sender, zroFee);
     const incrementCall = tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "increment"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "increment"),
       arguments: [
         tx.object(this.objects.counter),
         tx.object(this.objects.counterOapp),
@@ -8326,50 +7921,64 @@ var Counter = class {
         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, lzComposeInfo) {
+  setPeerMoveCall(tx, messagingChannel, eid, peer) {
     tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "set_lz_compose_info"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "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) {
-    return tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "eid"),
-      arguments: [tx.object(this.objects.counter)]
+  setDelegateMoveCall(tx, newDelegate) {
+    tx.moveCall({
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "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() {
-    return executeSimulate(
-      this.client,
-      (tx) => {
-        this.getEidMoveCall(tx);
-      },
-      (result) => bcs.bcs.U32.parse(result[0].value)
-    );
+  setLzComposeInfoMoveCall(tx, lzComposeInfo) {
+    tx.moveCall({
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "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
@@ -8377,7 +7986,7 @@ var Counter = class {
    */
   getCallCapAddressMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "call_cap_address"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "call_cap_address"),
       arguments: [tx.object(this.objects.counter)]
     });
   }
@@ -8401,7 +8010,7 @@ var Counter = class {
    */
   getComposerAddressMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "composer_address"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "composer_address"),
       arguments: [tx.object(this.objects.counter)]
     });
   }
@@ -8425,7 +8034,7 @@ var Counter = class {
    */
   getCountMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "get_count"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "get_count"),
       arguments: [tx.object(this.objects.counter)]
     });
   }
@@ -8449,7 +8058,7 @@ var Counter = class {
    */
   getComposedCountMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "get_composed_count"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "get_composed_count"),
       arguments: [tx.object(this.objects.counter)]
     });
   }
@@ -8474,7 +8083,7 @@ var Counter = class {
    */
   getOutboundCountMoveCall(tx, dstEid) {
     return tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "get_outbound_count"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "get_outbound_count"),
       arguments: [tx.object(this.objects.counter), asU32(tx, dstEid)]
     });
   }
@@ -8500,7 +8109,7 @@ var Counter = class {
    */
   getInboundCountMoveCall(tx, srcEid) {
     return tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "get_inbound_count"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "get_inbound_count"),
       arguments: [tx.object(this.objects.counter), asU32(tx, srcEid)]
     });
   }
@@ -8520,7 +8129,7 @@ var Counter = class {
   }
   nextNonceMoveCall(tx, srcEid, sender) {
     return tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "next_nonce"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "next_nonce"),
       arguments: [
         tx.object(this.objects.counter),
         asU32(tx, srcEid),
@@ -8539,7 +8148,7 @@ var Counter = class {
   }
   getMaxReceivedNonceMoveCall(tx, srcEid, sender) {
     return tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "get_max_received_nonce"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "get_max_received_nonce"),
       arguments: [
         tx.object(this.objects.counter),
         asU32(tx, srcEid),
@@ -8558,7 +8167,7 @@ var Counter = class {
   }
   isOrderedNonceMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "is_ordered_nonce"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "is_ordered_nonce"),
       arguments: [tx.object(this.objects.counter)]
     });
   }
@@ -8574,7 +8183,7 @@ var Counter = class {
   // === PTB Builder Functions ===
   lzReceiveInfoMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "lz_receive_info", "counter_ptb_builder"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "lz_receive_info", "counter_ptb_builder"),
       arguments: [
         tx.object(this.objects.counter),
         tx.object(this.objects.counterOapp),
@@ -8585,7 +8194,7 @@ var Counter = class {
   }
   lzComposeInfoMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Counter_instances, target_fn21).call(this, "lz_compose_info", "counter_ptb_builder"),
+      target: __privateMethod(this, _Counter_instances, target_fn20).call(this, "lz_compose_info", "counter_ptb_builder"),
       arguments: [
         tx.object(this.objects.counter),
         tx.object(this.objects.counterOapp),
@@ -8604,44 +8213,33 @@ _Counter_instances = new WeakSet();
  * @returns The full module path for the move call
  * @private
  */
-target_fn21 = function(name, module_name = MODULE_NAME20) {
+target_fn20 = function(name, module_name = MODULE_NAME19) {
   return `${this.packageId}::${module_name}::${name}`;
 };
-var MODULE_NAME21 = "oapp";
+var MODULE_NAME20 = "oapp";
 var OAppErrorCode = {
-  // OApp related errors (matching oapp.move)
-  OApp_EInvalidAdminCap: 1,
-  OApp_EInvalidOAppCap: 2,
-  OApp_EInvalidRefundAddress: 3,
-  OApp_EInvalidSendingCall: 4,
-  OApp_EOnlyEndpoint: 5,
-  OApp_EOnlyPeer: 6,
-  OApp_ESendingInProgress: 7,
-  // OAppPeer related errors (matching oapp_peer.move)
-  OAppPeer_EPeerNotFound: 0,
-  OAppPeer_EInvalidPeer: 1,
-  // EnforcedOptions related errors (matching enforced_options.move)
-  EnforcedOptions_EEnforcedOptionsNotFound: 1,
-  EnforcedOptions_EInvalidOptionsLength: 2,
-  EnforcedOptions_EInvalidOptionsType: 3,
-  // OAppInfoV1 related errors (matching oapp_info_v1.move)
-  OAppInfoV1_EInvalidData: 1,
-  OAppInfoV1_EInvalidVersion: 2
-};
-var _OApp_instances, oappInfo_fn, target_fn22;
+  // OApp related errors
+  OApp_EAlreadyInited: 1,
+  OApp_EChannelNotInited: 2,
+  OApp_EEndpointNotInited: 3,
+  OApp_EInvalidAdminCap: 4,
+  OApp_EInvalidCallCap: 5,
+  OApp_EOnlyEndpoint: 6,
+  OApp_EOnlyPeer: 7,
+  // EndpointConfig related errors
+  EndpointConfig_EInvalidAdminCap: 1,
+  EndpointConfig_EInvalidIntentType: 2,
+  EndpointConfig_EInvalidOAppCallCap: 3
+};
+var _OApp_instances, target_fn21;
 var OApp = class {
-  constructor(packageId, oappCallCapId, client, objects, moduleManager) {
+  constructor(packageId, client, objects, moduleManager) {
     this.moduleManager = moduleManager;
     __privateAdd(this, _OApp_instances);
-    this.oappInfo = null;
     this.packageId = packageId;
-    this.oappCallCapId = oappCallCapId;
     this.client = client;
     this.objects = objects;
   }
-  // setOAppInfo(oappInfo: OAppInfoV1): void {
-  //     this.oappInfo = oappInfo
-  // }
   // === Set Functions ===
   /**
    * Set enforced options for OApp messaging
@@ -8652,13 +8250,11 @@ var OApp = class {
    * @param msgType - Message type or transaction argument
    * @param options - Enforced options as bytes or transaction argument
    */
-  async setEnforcedOptionsMoveCall(tx, eid, msgType, options) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
-    const adminCap = await this.getAdminCap(oappInfo.oapp_object);
+  setEnforcedOptionsMoveCall(tx, oapp, adminCap, eid, msgType, options) {
     tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "set_enforced_options"),
+      target: __privateMethod(this, _OApp_instances, target_fn21).call(this, "set_enforced_options"),
       arguments: [
-        asObject(tx, oappInfo.oapp_object),
+        asObject(tx, oapp),
         asObject(tx, adminCap),
         asU32(tx, eid),
         asU16(tx, msgType),
@@ -8674,17 +8270,12 @@ var OApp = class {
    * @param eid - Peer endpoint ID or transaction argument
    * @param peer - Peer OApp address as bytes or transaction argument
    */
-  async setPeerMoveCall(tx, eid, peer) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
-    const adminCap = await this.getAdminCap(oappInfo.oapp_object);
-    const messagingChannel = await this.moduleManager.getEndpoint().getMessagingChannel(this.oappCallCapId);
+  setPeerMoveCall(tx, oapp, adminCap, eid, peer) {
     tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "set_peer"),
+      target: __privateMethod(this, _OApp_instances, target_fn21).call(this, "set_peer"),
       arguments: [
-        asObject(tx, oappInfo.oapp_object),
+        asObject(tx, oapp),
         asObject(tx, adminCap),
-        asObject(tx, this.objects.endpointV2),
-        asObject(tx, messagingChannel),
         asU32(tx, eid),
         asBytes32(tx, peer, this.moduleManager.getUtils())
       ]
@@ -8692,54 +8283,53 @@ var OApp = class {
   }
   // === View Functions ===
   /**
-   * Get admin capability address for OApp
+   * Get admin address for OApp
    * @param tx - The transaction to add the move call to
    * @param oapp - The OApp object ID or transaction argument
-   * @returns Transaction result containing the admin capability address
+   * @returns Transaction result containing the admin address
    */
-  getAdminCapMoveCall(tx, oapp) {
+  getAdminMoveCall(tx, oapp) {
     return tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "admin_cap"),
+      target: __privateMethod(this, _OApp_instances, target_fn21).call(this, "admin"),
       arguments: [asObject(tx, oapp)]
     });
   }
   /**
-   * Get admin capability address for OApp
+   * Get admin address for OApp
    * @param oapp - The OApp object ID
-   * @returns Promise<string> - The admin capability address
+   * @returns Promise<string> - The admin address
    */
-  async getAdminCap(oapp) {
+  async getAdmin(oapp) {
     return executeSimulate(
       this.client,
       (tx) => {
-        this.getAdminCapMoveCall(tx, oapp);
+        this.getAdminMoveCall(tx, oapp);
       },
       (result) => bcs.bcs.Address.parse(result[0].value)
     );
   }
   /**
-   * Get OApp CallCap identifier
+   * Get OApp address (call capability ID)
    * @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
+   * @returns Transaction result containing the OApp address
    */
-  async getOAppCapIdMoveCall(tx) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
+  getOAppAddressMoveCall(tx, oapp) {
     return tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "oapp_cap_id"),
-      arguments: [asObject(tx, oappInfo.oapp_object)]
+      target: __privateMethod(this, _OApp_instances, target_fn21).call(this, "oapp_address"),
+      arguments: [asObject(tx, 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
+   * Get OApp address (call capability ID)
+   * @param oapp - The OApp object ID
+   * @returns Promise<string> - The OApp address
    */
-  async getOAppCapId() {
+  async getOAppAddress(oapp) {
     return executeSimulate(
       this.client,
-      async (tx) => {
-        await this.getOAppCapIdMoveCall(tx);
+      (tx) => {
+        this.getOAppAddressMoveCall(tx, oapp);
       },
       (result) => bcs.bcs.Address.parse(result[0].value)
     );
@@ -8753,16 +8343,10 @@ var OApp = class {
    * @param extraOptions - Extra options to combine with enforced options or transaction argument
    * @returns Transaction result containing combined options
    */
-  async combineOptionsMoveCall(tx, eid, msgType, extraOptions) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
+  combineOptionsMoveCall(tx, oapp, eid, msgType, extraOptions) {
     return tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "combine_options"),
-      arguments: [
-        asObject(tx, oappInfo.oapp_object),
-        asU32(tx, eid),
-        asU16(tx, msgType),
-        asBytes(tx, extraOptions)
-      ]
+      target: __privateMethod(this, _OApp_instances, target_fn21).call(this, "combine_options"),
+      arguments: [asObject(tx, oapp), asU32(tx, eid), asU16(tx, msgType), asBytes(tx, extraOptions)]
     });
   }
   /**
@@ -8773,11 +8357,11 @@ var OApp = class {
    * @param extraOptions - Extra options to combine with enforced options
    * @returns Promise<Uint8Array> - Combined options as bytes
    */
-  async combineOptions(eid, msgType, extraOptions) {
+  async combineOptions(oapp, eid, msgType, extraOptions) {
     return executeSimulate(
       this.client,
-      async (tx) => {
-        await this.combineOptionsMoveCall(tx, eid, msgType, extraOptions);
+      (tx) => {
+        this.combineOptionsMoveCall(tx, oapp, eid, msgType, extraOptions);
       },
       (result) => new Uint8Array(bcs.bcs.vector(bcs.bcs.u8()).parse(result[0].value))
     );
@@ -8790,11 +8374,10 @@ var OApp = class {
    * @param msgType - Message type or transaction argument
    * @returns Transaction result containing enforced options
    */
-  async getEnforcedOptionsMoveCall(tx, eid, msgType) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
+  getEnforcedOptionsMoveCall(tx, oapp, eid, msgType) {
     return tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "get_enforced_options"),
-      arguments: [asObject(tx, oappInfo.oapp_object), asU32(tx, eid), asU16(tx, msgType)]
+      target: __privateMethod(this, _OApp_instances, target_fn21).call(this, "get_enforced_options"),
+      arguments: [asObject(tx, oapp), asU32(tx, eid), asU16(tx, msgType)]
     });
   }
   /**
@@ -8804,11 +8387,11 @@ var OApp = class {
    * @param msgType - Message type
    * @returns Promise<Uint8Array> - Enforced options as bytes
    */
-  async getEnforcedOptions(eid, msgType) {
+  async getEnforcedOptions(oapp, eid, msgType) {
     return executeSimulate(
       this.client,
-      async (tx) => {
-        await this.getEnforcedOptionsMoveCall(tx, eid, msgType);
+      (tx) => {
+        this.getEnforcedOptionsMoveCall(tx, oapp, eid, msgType);
       },
       (result) => new Uint8Array(bcs.bcs.vector(bcs.bcs.u8()).parse(result[0].value))
     );
@@ -8820,11 +8403,10 @@ var OApp = class {
    * @param dstEid - Destination endpoint ID or transaction argument
    * @returns Transaction result containing boolean result
    */
-  async hasPeerMoveCall(tx, dstEid) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
+  hasPeerMoveCall(tx, oapp, dstEid) {
     return tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "has_peer"),
-      arguments: [asObject(tx, oappInfo.oapp_object), asU32(tx, dstEid)]
+      target: __privateMethod(this, _OApp_instances, target_fn21).call(this, "has_peer"),
+      arguments: [asObject(tx, oapp), asU32(tx, dstEid)]
     });
   }
   /**
@@ -8833,11 +8415,11 @@ var OApp = class {
    * @param dstEid - Destination endpoint ID
    * @returns Promise<boolean> - True if peer is configured, false otherwise
    */
-  async hasPeer(dstEid) {
+  async hasPeer(oapp, dstEid) {
     return executeSimulate(
       this.client,
-      async (tx) => {
-        await this.hasPeerMoveCall(tx, dstEid);
+      (tx) => {
+        this.hasPeerMoveCall(tx, oapp, dstEid);
       },
       (result) => bcs.bcs.Bool.parse(result[0].value)
     );
@@ -8849,11 +8431,10 @@ var OApp = class {
    * @param dstEid - Destination endpoint ID or transaction argument
    * @returns Transaction result containing peer address
    */
-  async getPeerMoveCall(tx, dstEid) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
+  getPeerMoveCall(tx, oapp, dstEid) {
     return tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "get_peer"),
-      arguments: [asObject(tx, oappInfo.oapp_object), asU32(tx, dstEid)]
+      target: __privateMethod(this, _OApp_instances, target_fn21).call(this, "get_peer"),
+      arguments: [asObject(tx, oapp), asU32(tx, dstEid)]
     });
   }
   /**
@@ -8862,333 +8443,27 @@ var OApp = class {
    * @param dstEid - Destination endpoint ID
    * @returns Promise<Uint8Array> - Peer address as bytes32
    */
-  async getPeer(dstEid) {
-    return executeSimulate(
-      this.client,
-      async (tx) => {
-        await this.getPeerMoveCall(tx, dstEid);
-      },
-      (result) => {
-        return new Uint8Array(bcs.bcs.vector(bcs.bcs.u8()).parse(result[0].value));
-      }
-    );
-  }
-  getOAppInfoV1MoveCall(tx) {
-    const endpoint = this.moduleManager.getEndpoint();
-    const oappInfoRaw = endpoint.getLzReceiveInfoMoveCall(tx, this.oappCallCapId);
-    return tx.moveCall({
-      target: `${this.packageId}::oapp_info_v1::decode`,
-      arguments: [oappInfoRaw]
-    });
-  }
-  async getOAppInfoV1() {
+  async getPeer(oapp, dstEid) {
     return executeSimulate(
       this.client,
       (tx) => {
-        this.getOAppInfoV1MoveCall(tx);
+        this.getPeerMoveCall(tx, oapp, dstEid);
       },
       (result) => {
-        return OAppInfoV1Bcs.parse(result[0].value);
+        return new Uint8Array(bcs.bcs.vector(bcs.bcs.u8()).parse(result[0].value));
       }
     );
   }
-  // === Endpoint Call Functions ===
-  /**
-   * Register OApp with the endpoint
-   * @param tx - The transaction to add the move call to
-   * @param oappInfo - OApp information as bytes (optional)
-   * @returns Transaction result containing the messaging channel address
-   */
-  async registerOAppMoveCall(tx, oappInfo) {
-    let oappInfoArg;
-    if (isTransactionArgument(oappInfo)) {
-      oappInfoArg = oappInfo;
-    } else if (oappInfo) {
-      oappInfoArg = tx.pure.option("vector<u8>", Array.from(oappInfo));
-    } else {
-      oappInfoArg = tx.pure.option("vector<u8>", null);
-    }
-    const oappInfoObj = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
-    const adminCap = await this.getAdminCap(oappInfoObj.oapp_object);
-    return tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "register_oapp", "endpoint_calls"),
-      arguments: [
-        asObject(tx, oappInfoObj.oapp_object),
-        asObject(tx, adminCap),
-        asObject(tx, this.objects.endpointV2),
-        oappInfoArg
-      ]
-    });
-  }
-  /**
-   * Set delegate for OApp
-   * @param tx - The transaction to add the move call to
-   * @param newDelegate - New delegate address
-   */
-  async setDelegateMoveCall(tx, newDelegate) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
-    const adminCap = await this.getAdminCap(oappInfo.oapp_object);
-    tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "set_delegate", "endpoint_calls"),
-      arguments: [
-        asObject(tx, oappInfo.oapp_object),
-        asObject(tx, adminCap),
-        asObject(tx, this.objects.endpointV2),
-        asAddress(tx, newDelegate)
-      ]
-    });
-  }
-  /**
-   * Set OApp information in the endpoint
-   * @param tx - The transaction to add the move call to
-   * @param oappInfo - OApp information as bytes
-   */
-  async setOAppInfoMoveCall(tx, oappInfo) {
-    const oappInfoObj = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
-    const adminCap = await this.getAdminCap(oappInfoObj.oapp_object);
-    tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "set_oapp_info", "endpoint_calls"),
-      arguments: [
-        asObject(tx, oappInfoObj.oapp_object),
-        asObject(tx, adminCap),
-        asObject(tx, this.objects.endpointV2),
-        asBytes(tx, oappInfo)
-      ]
-    });
-  }
-  /**
-   * Initialize channel with remote OApp
-   * @param tx - The transaction to add the move call to
-   * @param remoteEid - Remote endpoint ID
-   * @param remoteOApp - Remote OApp address as bytes32
-   */
-  async initChannelMoveCall(tx, remoteEid, remoteOApp) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
-    const adminCap = await this.getAdminCap(oappInfo.oapp_object);
-    const messagingChannel = await this.moduleManager.getEndpoint().getMessagingChannel(this.oappCallCapId);
-    tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "init_channel", "endpoint_calls"),
-      arguments: [
-        asObject(tx, oappInfo.oapp_object),
-        asObject(tx, adminCap),
-        asObject(tx, this.objects.endpointV2),
-        asObject(tx, messagingChannel),
-        asU32(tx, remoteEid),
-        asBytes32(tx, remoteOApp, this.moduleManager.getUtils())
-      ]
-    });
-  }
-  /**
-   * Clear a message from the messaging channel
-   * @param tx - The transaction to add the move call to
-   * @param srcEid - Source endpoint ID
-   * @param sender - Sender address as bytes32
-   * @param nonce - Message nonce
-   * @param guid - Message GUID as bytes32
-   * @param message - Message payload
-   */
-  async clearMoveCall(tx, srcEid, sender, nonce, guid, message) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
-    const adminCap = await this.getAdminCap(oappInfo.oapp_object);
-    const messagingChannel = await this.moduleManager.getEndpoint().getMessagingChannel(this.oappCallCapId);
-    tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "clear", "endpoint_calls"),
-      arguments: [
-        asObject(tx, oappInfo.oapp_object),
-        asObject(tx, adminCap),
-        asObject(tx, this.objects.endpointV2),
-        asObject(tx, messagingChannel),
-        asU32(tx, srcEid),
-        asBytes32(tx, sender, this.moduleManager.getUtils()),
-        asU64(tx, nonce),
-        asBytes32(tx, guid, this.moduleManager.getUtils()),
-        asBytes(tx, message)
-      ]
-    });
-  }
-  /**
-   * Skip a message in the messaging channel
-   * @param tx - The transaction to add the move call to
-   * @param srcEid - Source endpoint ID
-   * @param sender - Sender address as bytes32
-   * @param nonce - Message nonce
-   */
-  async skipMoveCall(tx, srcEid, sender, nonce) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
-    const adminCap = await this.getAdminCap(oappInfo.oapp_object);
-    const messagingChannel = await this.moduleManager.getEndpoint().getMessagingChannel(this.oappCallCapId);
-    tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "skip", "endpoint_calls"),
-      arguments: [
-        asObject(tx, oappInfo.oapp_object),
-        asObject(tx, adminCap),
-        asObject(tx, this.objects.endpointV2),
-        asObject(tx, messagingChannel),
-        asU32(tx, srcEid),
-        asBytes32(tx, sender, this.moduleManager.getUtils()),
-        asU64(tx, nonce)
-      ]
-    });
-  }
-  /**
-   * Nilify a message in the messaging channel
-   * @param tx - The transaction to add the move call to
-   * @param srcEid - Source endpoint ID
-   * @param sender - Sender address as bytes32
-   * @param nonce - Message nonce
-   * @param payloadHash - Payload hash as bytes32
-   */
-  async nilifyMoveCall(tx, srcEid, sender, nonce, payloadHash) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
-    const adminCap = await this.getAdminCap(oappInfo.oapp_object);
-    const messagingChannel = await this.moduleManager.getEndpoint().getMessagingChannel(this.oappCallCapId);
-    tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "nilify", "endpoint_calls"),
-      arguments: [
-        asObject(tx, oappInfo.oapp_object),
-        asObject(tx, adminCap),
-        asObject(tx, this.objects.endpointV2),
-        asObject(tx, messagingChannel),
-        asU32(tx, srcEid),
-        asBytes32(tx, sender, this.moduleManager.getUtils()),
-        asU64(tx, nonce),
-        asBytes32(tx, payloadHash, this.moduleManager.getUtils())
-      ]
-    });
-  }
-  /**
-   * Burn a message in the messaging channel
-   * @param tx - The transaction to add the move call to
-   * @param srcEid - Source endpoint ID
-   * @param sender - Sender address as bytes32
-   * @param nonce - Message nonce
-   * @param payloadHash - Payload hash as bytes32
-   */
-  async burnMoveCall(tx, srcEid, sender, nonce, payloadHash) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
-    const adminCap = await this.getAdminCap(oappInfo.oapp_object);
-    const messagingChannel = await this.moduleManager.getEndpoint().getMessagingChannel(this.oappCallCapId);
-    tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "burn", "endpoint_calls"),
-      arguments: [
-        asObject(tx, oappInfo.oapp_object),
-        asObject(tx, adminCap),
-        asObject(tx, this.objects.endpointV2),
-        asObject(tx, messagingChannel),
-        asU32(tx, srcEid),
-        asBytes32(tx, sender, this.moduleManager.getUtils()),
-        asU64(tx, nonce),
-        asBytes32(tx, payloadHash, this.moduleManager.getUtils())
-      ]
-    });
-  }
-  /**
-   * Set send library for a destination chain
-   * @param tx - The transaction to add the move call to
-   * @param dstEid - Destination endpoint ID
-   * @param sendLibrary - Send library address
-   */
-  async setSendLibraryMoveCall(tx, dstEid, sendLibrary) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
-    const adminCap = await this.getAdminCap(oappInfo.oapp_object);
-    tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "set_send_library", "endpoint_calls"),
-      arguments: [
-        asObject(tx, oappInfo.oapp_object),
-        asObject(tx, adminCap),
-        asObject(tx, this.objects.endpointV2),
-        asU32(tx, dstEid),
-        asAddress(tx, sendLibrary)
-      ]
-    });
-  }
-  /**
-   * Set receive library for a source chain
-   * @param tx - The transaction to add the move call to
-   * @param srcEid - Source endpoint ID
-   * @param receiveLibrary - Receive library address
-   * @param gracePeriod - Grace period in seconds
-   */
-  async setReceiveLibraryMoveCall(tx, srcEid, receiveLibrary, gracePeriod) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
-    const adminCap = await this.getAdminCap(oappInfo.oapp_object);
-    tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "set_receive_library", "endpoint_calls"),
-      arguments: [
-        asObject(tx, oappInfo.oapp_object),
-        asObject(tx, adminCap),
-        asObject(tx, this.objects.endpointV2),
-        asU32(tx, srcEid),
-        asAddress(tx, receiveLibrary),
-        asU64(tx, gracePeriod),
-        tx.object.clock()
-      ]
-    });
-  }
-  /**
-   * Set receive library timeout for a source chain
-   * @param tx - The transaction to add the move call to
-   * @param srcEid - Source endpoint ID
-   * @param receiveLibrary - Receive library address
-   * @param expiry - Expiry timestamp in seconds
-   */
-  async setReceiveLibraryTimeoutMoveCall(tx, srcEid, receiveLibrary, expiry) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
-    const adminCap = await this.getAdminCap(oappInfo.oapp_object);
-    tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "set_receive_library_timeout", "endpoint_calls"),
-      arguments: [
-        asObject(tx, oappInfo.oapp_object),
-        asObject(tx, adminCap),
-        asObject(tx, this.objects.endpointV2),
-        asU32(tx, srcEid),
-        asAddress(tx, receiveLibrary),
-        asU64(tx, expiry),
-        tx.object.clock()
-      ]
-    });
-  }
-  /**
-   * Set configuration for a message library
-   * @param tx - The transaction to add the move call to
-   * @param lib - Library address
-   * @param eid - Endpoint ID
-   * @param configType - Configuration type
-   * @param config - Configuration data as bytes
-   * @returns Transaction result containing Call<MessageLibSetConfigParam, Void>
-   */
-  async setConfigMoveCall(tx, lib, eid, configType, config) {
-    const oappInfo = await __privateMethod(this, _OApp_instances, oappInfo_fn).call(this);
-    const adminCap = await this.getAdminCap(oappInfo.oapp_object);
-    return tx.moveCall({
-      target: __privateMethod(this, _OApp_instances, target_fn22).call(this, "set_config", "endpoint_calls"),
-      typeArguments: [],
-      arguments: [
-        asObject(tx, oappInfo.oapp_object),
-        asObject(tx, adminCap),
-        asObject(tx, this.objects.endpointV2),
-        asAddress(tx, lib),
-        asU32(tx, eid),
-        asU32(tx, configType),
-        asBytes(tx, config)
-      ]
-    });
-  }
 };
 _OApp_instances = new WeakSet();
-oappInfo_fn = async function() {
-  if (!this.oappInfo) {
-    this.oappInfo = await this.getOAppInfoV1();
-  }
-  return this.oappInfo;
-};
+// === Private Functions ===
 /**
  * Generate the full target path for move calls
  * @param name - The function name to call
  * @returns The full module path for the move call
  * @private
  */
-target_fn22 = function(name, module_name = MODULE_NAME21) {
+target_fn21 = function(name, module_name = MODULE_NAME20) {
   return `${this.packageId}::${module_name}::${name}`;
 };
 var MODULE_NAME_ENDPOINT_VIEWS = "endpoint_views";
@@ -9357,24 +8632,16 @@ uln302ViewsTarget_fn = function(functionName) {
 };
 var DEFAULT_MODULE_NAME = "call";
 var CallErrorCode = {
-  // Call related errors (matching call.move)
-  Call_ECallNotActive: 1,
+  // Call related errors (with Call_ prefix)
+  Call_ECallNotCompletable: 1,
   Call_ECallNotCompleted: 2,
-  Call_ECallNotCreating: 3,
+  Call_ECallNotSealed: 3,
   Call_ECallNotRoot: 4,
-  Call_ECallNotWaiting: 5,
-  Call_EInvalidChild: 6,
-  Call_EInvalidNonce: 7,
-  Call_EInvalidParent: 8,
-  Call_EParameterNotMutable: 9,
-  Call_EUnauthorized: 10,
-  // CallCap related errors (matching call_cap.move)
-  CallCap_EBadWitness: 1,
-  // MultiCall related errors (matching multi_call.move)
-  MultiCall_ECalleeNotFound: 1,
-  MultiCall_EUnauthorized: 2
-};
-var _Call_instances, target_fn23;
+  Call_ECallSealed: 5,
+  Call_EInvalidParent: 6,
+  Call_EUnauthorized: 7
+};
+var _Call_instances, target_fn22;
 var Call = class {
   constructor(packageId, client) {
     __privateAdd(this, _Call_instances);
@@ -9390,7 +8657,7 @@ var Call = class {
    */
   newIndividualCapMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Call_instances, target_fn23).call(this, "new_individual_cap", "call_cap"),
+      target: __privateMethod(this, _Call_instances, target_fn22).call(this, "new_individual_cap", "call_cap"),
       arguments: []
     });
   }
@@ -9401,7 +8668,7 @@ var Call = class {
    */
   voidMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Call_instances, target_fn23).call(this, "void"),
+      target: __privateMethod(this, _Call_instances, target_fn22).call(this, "void"),
       arguments: []
     });
   }
@@ -9416,7 +8683,7 @@ var Call = class {
    */
   resultMoveCall(tx, paramType, resultType, call) {
     return tx.moveCall({
-      target: __privateMethod(this, _Call_instances, target_fn23).call(this, "result"),
+      target: __privateMethod(this, _Call_instances, target_fn22).call(this, "result"),
       typeArguments: [paramType, resultType],
       arguments: [call]
     });
@@ -9431,7 +8698,7 @@ var Call = class {
    */
   recipientMoveCall(tx, paramType, resultType, call) {
     return tx.moveCall({
-      target: __privateMethod(this, _Call_instances, target_fn23).call(this, "recipient"),
+      target: __privateMethod(this, _Call_instances, target_fn22).call(this, "recipient"),
       typeArguments: [paramType, resultType],
       arguments: [call]
     });
@@ -9445,7 +8712,7 @@ var Call = class {
    */
   callCapIdMoveCall(tx, callCap) {
     return tx.moveCall({
-      target: __privateMethod(this, _Call_instances, target_fn23).call(this, "id", "call_cap"),
+      target: __privateMethod(this, _Call_instances, target_fn22).call(this, "id", "call_cap"),
       arguments: [asObject(tx, callCap)]
     });
   }
@@ -9472,7 +8739,7 @@ var Call = class {
    */
   isIndividualCapMoveCall(tx, callCap) {
     return tx.moveCall({
-      target: __privateMethod(this, _Call_instances, target_fn23).call(this, "is_individual", "call_cap"),
+      target: __privateMethod(this, _Call_instances, target_fn22).call(this, "is_individual", "call_cap"),
       arguments: [asObject(tx, callCap)]
     });
   }
@@ -9498,7 +8765,7 @@ var Call = class {
    */
   isPackageCapMoveCall(tx, callCap) {
     return tx.moveCall({
-      target: __privateMethod(this, _Call_instances, target_fn23).call(this, "is_package", "call_cap"),
+      target: __privateMethod(this, _Call_instances, target_fn22).call(this, "is_package", "call_cap"),
       arguments: [asObject(tx, callCap)]
     });
   }
@@ -9525,7 +8792,7 @@ var Call = class {
    */
   packageAddressMoveCall(tx, callCap) {
     return tx.moveCall({
-      target: __privateMethod(this, _Call_instances, target_fn23).call(this, "package_address", "call_cap"),
+      target: __privateMethod(this, _Call_instances, target_fn22).call(this, "package_address", "call_cap"),
       arguments: [asObject(tx, callCap)]
     });
   }
@@ -9560,7 +8827,7 @@ _Call_instances = new WeakSet();
  * @returns The full module path for the move call
  * @private
  */
-target_fn23 = function(name, module_name = DEFAULT_MODULE_NAME) {
+target_fn22 = function(name, module_name = DEFAULT_MODULE_NAME) {
   return `${this.packageId}::${module_name}::${name}`;
 };
 
@@ -9573,7 +8840,7 @@ var UtilsErrorCode = {
   // Utils related errors (with Utils_ prefix)
   Utils_EInvalidLength: 1
 };
-var _Utils_instances, target_fn24, destroyZeroCoin_fn, fetchSufficientCoins_fn;
+var _Utils_instances, target_fn23, destroyZeroCoin_fn, fetchSufficientCoins_fn;
 var Utils = class {
   constructor(packageId, client) {
     __privateAdd(this, _Utils_instances);
@@ -9589,7 +8856,7 @@ var Utils = class {
    */
   fromBytesMoveCall(tx, peer) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "from_bytes"),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "from_bytes"),
       arguments: [asBytes(tx, peer)]
     });
   }
@@ -9601,7 +8868,7 @@ var Utils = class {
    */
   fromBytesLeftPaddedMoveCall(tx, bytes) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "from_bytes_left_padded"),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "from_bytes_left_padded"),
       arguments: [asBytes(tx, bytes)]
     });
   }
@@ -9613,7 +8880,7 @@ var Utils = class {
    */
   fromBytesRightPaddedMoveCall(tx, bytes) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "from_bytes_right_padded"),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "from_bytes_right_padded"),
       arguments: [asBytes(tx, bytes)]
     });
   }
@@ -9625,7 +8892,7 @@ var Utils = class {
    */
   fromAddressMoveCall(tx, address) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "from_address"),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "from_address"),
       arguments: [asAddress(tx, address)]
     });
   }
@@ -9637,7 +8904,7 @@ var Utils = class {
    */
   fromIdMoveCall(tx, id) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "from_id"),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "from_id"),
       arguments: [asObject(tx, id)]
     });
   }
@@ -9648,7 +8915,7 @@ var Utils = class {
    */
   zeroBytes32MoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "zero_bytes32")
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "zero_bytes32")
     });
   }
   /**
@@ -9658,7 +8925,7 @@ var Utils = class {
    */
   ffBytes32MoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "ff_bytes32")
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "ff_bytes32")
     });
   }
   /**
@@ -9669,7 +8936,7 @@ var Utils = class {
    */
   isZeroMoveCall(tx, bytes32) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "is_zero"),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "is_zero"),
       arguments: [bytes32]
     });
   }
@@ -9681,7 +8948,7 @@ var Utils = class {
    */
   isFfMoveCall(tx, bytes32) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "is_ff"),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "is_ff"),
       arguments: [bytes32]
     });
   }
@@ -9693,7 +8960,7 @@ var Utils = class {
    */
   toBytesMoveCall(tx, bytes32) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "to_bytes"),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "to_bytes"),
       arguments: [bytes32]
     });
   }
@@ -9705,7 +8972,7 @@ var Utils = class {
    */
   toAddressMoveCall(tx, bytes32) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "to_address"),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "to_address"),
       arguments: [bytes32]
     });
   }
@@ -9717,7 +8984,7 @@ var Utils = class {
    */
   toIdMoveCall(tx, bytes32) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "to_id"),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "to_id"),
       arguments: [bytes32]
     });
   }
@@ -9730,7 +8997,7 @@ var Utils = class {
    */
   newReaderMoveCall(tx, buffer) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "create", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "create", BUFFER_READER_MODULE_NAME),
       arguments: [asBytes(tx, buffer)]
     });
   }
@@ -9742,7 +9009,7 @@ var Utils = class {
    */
   positionMoveCall(tx, reader) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "position", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "position", BUFFER_READER_MODULE_NAME),
       arguments: [reader]
     });
   }
@@ -9754,7 +9021,7 @@ var Utils = class {
    */
   remainingLengthMoveCall(tx, reader) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "remaining_length", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "remaining_length", BUFFER_READER_MODULE_NAME),
       arguments: [reader]
     });
   }
@@ -9767,7 +9034,7 @@ var Utils = class {
    */
   skipMoveCall(tx, reader, len) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "skip", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "skip", BUFFER_READER_MODULE_NAME),
       arguments: [reader, asU64(tx, len)]
     });
   }
@@ -9780,7 +9047,7 @@ var Utils = class {
    */
   setPositionMoveCall(tx, reader, position) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "set_position", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "set_position", BUFFER_READER_MODULE_NAME),
       arguments: [reader, asU64(tx, position)]
     });
   }
@@ -9793,7 +9060,7 @@ var Utils = class {
    */
   rewindMoveCall(tx, reader, len) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "rewind", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "rewind", BUFFER_READER_MODULE_NAME),
       arguments: [reader, asU64(tx, len)]
     });
   }
@@ -9805,7 +9072,7 @@ var Utils = class {
    */
   readBoolMoveCall(tx, reader) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "read_bool", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "read_bool", BUFFER_READER_MODULE_NAME),
       arguments: [reader]
     });
   }
@@ -9817,7 +9084,7 @@ var Utils = class {
    */
   readU8MoveCall(tx, reader) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "read_u8", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "read_u8", BUFFER_READER_MODULE_NAME),
       arguments: [reader]
     });
   }
@@ -9829,7 +9096,7 @@ var Utils = class {
    */
   readU16MoveCall(tx, reader) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "read_u16", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "read_u16", BUFFER_READER_MODULE_NAME),
       arguments: [reader]
     });
   }
@@ -9841,7 +9108,7 @@ var Utils = class {
    */
   readU32MoveCall(tx, reader) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "read_u32", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "read_u32", BUFFER_READER_MODULE_NAME),
       arguments: [reader]
     });
   }
@@ -9853,7 +9120,7 @@ var Utils = class {
    */
   readU64MoveCall(tx, reader) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "read_u64", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "read_u64", BUFFER_READER_MODULE_NAME),
       arguments: [reader]
     });
   }
@@ -9865,7 +9132,7 @@ var Utils = class {
    */
   readU128MoveCall(tx, reader) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "read_u128", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "read_u128", BUFFER_READER_MODULE_NAME),
       arguments: [reader]
     });
   }
@@ -9877,7 +9144,7 @@ var Utils = class {
    */
   readU256MoveCall(tx, reader) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "read_u256", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "read_u256", BUFFER_READER_MODULE_NAME),
       arguments: [reader]
     });
   }
@@ -9889,7 +9156,7 @@ var Utils = class {
    */
   readBytes32MoveCall(tx, reader) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "read_bytes32", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "read_bytes32", BUFFER_READER_MODULE_NAME),
       arguments: [reader]
     });
   }
@@ -9901,7 +9168,7 @@ var Utils = class {
    */
   readAddressMoveCall(tx, reader) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "read_address", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "read_address", BUFFER_READER_MODULE_NAME),
       arguments: [reader]
     });
   }
@@ -9914,7 +9181,7 @@ var Utils = class {
    */
   readFixedLenBytesMoveCall(tx, reader, len) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "read_fixed_len_bytes", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "read_fixed_len_bytes", BUFFER_READER_MODULE_NAME),
       arguments: [reader, asU64(tx, len)]
     });
   }
@@ -9926,7 +9193,7 @@ var Utils = class {
    */
   readBytesUntilEndMoveCall(tx, reader) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "read_bytes_until_end", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "read_bytes_until_end", BUFFER_READER_MODULE_NAME),
       arguments: [reader]
     });
   }
@@ -9938,7 +9205,7 @@ var Utils = class {
    */
   readerBufferLengthMoveCall(tx, reader) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "length", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "length", BUFFER_READER_MODULE_NAME),
       arguments: [reader]
     });
   }
@@ -9950,7 +9217,7 @@ var Utils = class {
    */
   readerToBytesMoveCall(tx, reader) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "to_bytes", BUFFER_READER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "to_bytes", BUFFER_READER_MODULE_NAME),
       arguments: [reader]
     });
   }
@@ -9962,7 +9229,7 @@ var Utils = class {
    */
   newWriterMoveCall(tx) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "new", BUFFER_WRITER_MODULE_NAME)
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "new", BUFFER_WRITER_MODULE_NAME)
     });
   }
   /**
@@ -9973,7 +9240,7 @@ var Utils = class {
    */
   createWriterMoveCall(tx, buffer) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "create", BUFFER_WRITER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "create", BUFFER_WRITER_MODULE_NAME),
       arguments: [asBytes(tx, buffer)]
     });
   }
@@ -9985,7 +9252,7 @@ var Utils = class {
    */
   writerBufferLengthMoveCall(tx, writer) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "length", BUFFER_WRITER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "length", BUFFER_WRITER_MODULE_NAME),
       arguments: [writer]
     });
   }
@@ -9997,7 +9264,7 @@ var Utils = class {
    */
   writerToBytesMoveCall(tx, writer) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "to_bytes", BUFFER_WRITER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "to_bytes", BUFFER_WRITER_MODULE_NAME),
       arguments: [writer]
     });
   }
@@ -10010,7 +9277,7 @@ var Utils = class {
    */
   writeBoolMoveCall(tx, writer, value) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "write_bool", BUFFER_WRITER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "write_bool", BUFFER_WRITER_MODULE_NAME),
       arguments: [writer, asBool(tx, value)]
     });
   }
@@ -10023,7 +9290,7 @@ var Utils = class {
    */
   writeU8MoveCall(tx, writer, value) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "write_u8", BUFFER_WRITER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "write_u8", BUFFER_WRITER_MODULE_NAME),
       arguments: [writer, asU8(tx, value)]
     });
   }
@@ -10036,7 +9303,7 @@ var Utils = class {
    */
   writeU16MoveCall(tx, writer, value) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "write_u16", BUFFER_WRITER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "write_u16", BUFFER_WRITER_MODULE_NAME),
       arguments: [writer, asU16(tx, value)]
     });
   }
@@ -10049,7 +9316,7 @@ var Utils = class {
    */
   writeU32MoveCall(tx, writer, value) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "write_u32", BUFFER_WRITER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "write_u32", BUFFER_WRITER_MODULE_NAME),
       arguments: [writer, asU32(tx, value)]
     });
   }
@@ -10062,7 +9329,7 @@ var Utils = class {
    */
   writeU64MoveCall(tx, writer, value) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "write_u64", BUFFER_WRITER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "write_u64", BUFFER_WRITER_MODULE_NAME),
       arguments: [writer, asU64(tx, value)]
     });
   }
@@ -10075,7 +9342,7 @@ var Utils = class {
    */
   writeU128MoveCall(tx, writer, value) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "write_u128", BUFFER_WRITER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "write_u128", BUFFER_WRITER_MODULE_NAME),
       arguments: [writer, asU128(tx, value)]
     });
   }
@@ -10088,7 +9355,7 @@ var Utils = class {
    */
   writeU256MoveCall(tx, writer, value) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "write_u256", BUFFER_WRITER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "write_u256", BUFFER_WRITER_MODULE_NAME),
       arguments: [writer, asU256(tx, value)]
     });
   }
@@ -10101,7 +9368,7 @@ var Utils = class {
    */
   writeBytesMoveCall(tx, writer, bytes) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "write_bytes", BUFFER_WRITER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "write_bytes", BUFFER_WRITER_MODULE_NAME),
       arguments: [writer, asBytes(tx, bytes)]
     });
   }
@@ -10114,7 +9381,7 @@ var Utils = class {
    */
   writeAddressMoveCall(tx, writer, address) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "write_address", BUFFER_WRITER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "write_address", BUFFER_WRITER_MODULE_NAME),
       arguments: [writer, asAddress(tx, address)]
     });
   }
@@ -10127,7 +9394,7 @@ var Utils = class {
    */
   writeBytes32MoveCall(tx, writer, bytes32) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "write_bytes32", BUFFER_WRITER_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "write_bytes32", BUFFER_WRITER_MODULE_NAME),
       arguments: [writer, asBytes32(tx, bytes32, this)]
     });
   }
@@ -10140,7 +9407,7 @@ var Utils = class {
    */
   originalPackageOfTypeMoveCall(tx, typeArgument) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "original_package_of_type", PACKAGE_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "original_package_of_type", PACKAGE_MODULE_NAME),
       typeArguments: [typeArgument]
     });
   }
@@ -10152,7 +9419,7 @@ var Utils = class {
    */
   packageOfTypeMoveCall(tx, typeArgument) {
     return tx.moveCall({
-      target: __privateMethod(this, _Utils_instances, target_fn24).call(this, "package_of_type", PACKAGE_MODULE_NAME),
+      target: __privateMethod(this, _Utils_instances, target_fn23).call(this, "package_of_type", PACKAGE_MODULE_NAME),
       typeArguments: [typeArgument]
     });
   }
@@ -10253,7 +9520,7 @@ _Utils_instances = new WeakSet();
  * @returns The full module path for the move call
  * @private
  */
-target_fn24 = function(name, module_name = BYTES32_MODULE_NAME) {
+target_fn23 = function(name, module_name = BYTES32_MODULE_NAME) {
   return `${this.packageId}::${module_name}::${name}`;
 };
 /**
@@ -10469,7 +9736,8 @@ var ModuleManager = class {
       ["call" /* Call */]: new Call(packages.call, client),
       ["treasury" /* Treasury */]: new Treasury(packages.treasury, client, objects, this),
       ["layerZeroViews" /* LayerZeroViews */]: new LayerZeroViews(packages.layerzeroViews, client, objects, this),
-      ["ptbBuilder" /* PtbBuilder */]: new PtbBuilder(packages.ptbMoveCall, client)
+      ["ptbBuilder" /* PtbBuilder */]: new PtbBuilder(packages.ptbMoveCall, client),
+      ["oapp" /* Oapp */]: new OApp(packages.oapp, client, objects, this)
     });
   }
   // === Core Module Getters ===
@@ -10503,12 +9771,8 @@ var ModuleManager = class {
   getPtbBuilder() {
     return this.getModule("ptbBuilder" /* PtbBuilder */);
   }
-  getOApp(client, callCapId, options) {
-    return this.getOrCreateModule("oapp" /* Oapp */ + callCapId, options, () => {
-      const packageId = options?.packageId ?? this.packages.oapp;
-      const objects = this.mergeObjectsOptions(options);
-      return new OApp(packageId, callCapId, client, objects, this);
-    });
+  getOApp() {
+    return this.getModule("oapp" /* Oapp */);
   }
   // === Non-core Module Getters (created on-demand with caching) ===
   getCounter(client, options) {
@@ -10614,13 +9878,6 @@ var ModuleManager = class {
       return new BlockedMessageLibPtbBuilder(packageId, client, objects, this);
     });
   }
-  getWorkerRegistry(client, options) {
-    return this.getOrCreateModule("workerRegistry" /* WorkerRegistry */, options, () => {
-      const packageId = options?.packageId ?? this.packages.workerRegistry;
-      const objects = this.mergeObjectsOptions(options);
-      return new WorkerRegistry(packageId, client, objects, this);
-    });
-  }
   // === Private Utility Methods ===
   /**
    * Merge objects configuration with options, avoiding unnecessary object spreading
@@ -10634,203 +9891,193 @@ var ModuleManager = class {
 };
 var PACKAGE_UTILS_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xcdad05867c25d6461e5813071116fa3f26d56a9b52ad053747457efb79d45714",
-  [lzDefinitions.Stage.TESTNET]: "0x1ffa033e3853175bc72c68a89d20735af140dd6dd54f04079200b458f1796772",
+  [lzDefinitions.Stage.TESTNET]: "0x7129b63448e84ee4a5e1a05f0536861f92a4a6a2cb2447b9c4cf6fa3ea6b16dd",
   [lzDefinitions.Stage.SANDBOX]: "0xb60f3952a3dc284637f419ac445b6b3d5a2ea112252c4bf686f2671cbecbb7a3"
 };
 var PACKAGE_ENDPOINT_V2_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xf625a8bde20d64850a4ec7b01c1918d9a0a29495546de7a0144440275f9b933c",
-  [lzDefinitions.Stage.TESTNET]: "0x66267e7a96028b75e147ad3eeb84d480fc7c9e021a2078e8570ddba276c70bcb",
-  [lzDefinitions.Stage.SANDBOX]: "0x2f2b96ecd837710e681cdedda00f75bccf50be0f0de15a72c70e05bb94e35637"
+  [lzDefinitions.Stage.TESTNET]: "0x85dd52af20c3d8047685dcb6fddc443934b8cd2b6fbe9d2d262a5f6943f24557",
+  [lzDefinitions.Stage.SANDBOX]: "0xcd97606354aaa69e476f2f3cfa374ed73f2a3d08cfc305d74489b2fcbb988805"
 };
 var PACKAGE_COUNTER_V2_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xfe1e336fdb42fa5ef85ab9a9c932b58c43e0bb58273cecea9d00cb5d05159914",
-  [lzDefinitions.Stage.TESTNET]: "0xf0fc6228a880f8f4a64f80aba803e13a8f084f92efeb19447e1f3c56c51c4956",
-  [lzDefinitions.Stage.SANDBOX]: "0x56423e73c245db920ee34beea916abbf8c83aedfcdf50772d52fa065f028af8e"
+  [lzDefinitions.Stage.TESTNET]: "0xa6a19e84c7df2014e384cdd56f5674e5a0c06b92cc5d33fca89633680a9ebcd7",
+  [lzDefinitions.Stage.SANDBOX]: "0xa8e56b7c5ec0dee71349e0018407eea5eb72482f074670469206c9897e46b53b"
 };
 var PACKAGE_SIMPLE_MESSAGE_LIB_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x83651370065f70112b20007137c7235a2a243055d9f59cb5e162c00c4a1680a7",
-  [lzDefinitions.Stage.TESTNET]: "0x726eb40230616f5aef72e903a9dc68b79d1c51b31ff87f3fb8b4199ebb6be343",
-  [lzDefinitions.Stage.SANDBOX]: "0x4923636e4e70672fd8a5dd64fd845ac179d7423466090e2b5fac685ba33e9578"
+  [lzDefinitions.Stage.TESTNET]: "0xd1fbc2529b4c581c5105031b495866cece446f2123319f6d82a76151b999717e",
+  [lzDefinitions.Stage.SANDBOX]: "0xf4bb61efa1420dfe668c741c51b37d6a920282bfe5a8b443e0fe745be57ebf93"
 };
 var PACKAGE_ULN_302_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xd73c9d588717c32fa327335d9beaf59b983b808577a382e013d8c7161a323d8e",
-  [lzDefinitions.Stage.TESTNET]: "0x2e927b16ef11f712b67447152c1f0bbe8c97c166e804fa5746a4123391c166e8",
-  [lzDefinitions.Stage.SANDBOX]: "0x1ef21ad32c88153a3b7a7e3026976b9b6ceb048fb9e77e684057c3bfcd64a307"
+  [lzDefinitions.Stage.TESTNET]: "0x556bd8fba10ba9e8be88a3ed54b8cbeb8b512b95e5c107cde7d7b10b754069c2",
+  [lzDefinitions.Stage.SANDBOX]: "0x46d99d235e3990496e2b45c207086fef54e07c64a38f43b6439c4adc762002c5"
 };
 var PACKAGE_ULN_302_PTB_BUILDER_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x67b3a43a3aa962e1a6012b04f68e6f358803f5970858f4de22684d6d13fcd747",
-  [lzDefinitions.Stage.TESTNET]: "0x59fbb05cb8f60250c1fb8fcd4d2e41b0639ce4b5984e44bec72274e4a048bdab",
-  [lzDefinitions.Stage.SANDBOX]: "0x1f828bee36aafee952d70d369a3a413f4f170e39f2d6aff71a4416b7c2fed9f0"
+  [lzDefinitions.Stage.TESTNET]: "0x71a23cdd1cb88b52a40cd2862c4ca607bd27e0f02f136e18f95351050fec9a89",
+  [lzDefinitions.Stage.SANDBOX]: "0x2ec29789577956a8d34e415319a3f4d9e91bf58bbb78ffc0586610839392b411"
 };
 var PACKAGE_DVN_PTB_BUILDER_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xb3f3a6d39a441a0f41a621d27427cedf624d500b3da5cd7051bc5835b21ac3ba",
-  [lzDefinitions.Stage.TESTNET]: "0x23ffda86dcc14b6e84707a43a3b59785958dbb455c62262013065d30e49c1e3b",
-  [lzDefinitions.Stage.SANDBOX]: "0xf4bdef91fb8adf4db1f4c1aec0451871a5d2a4e4b26e2298765b86d3dca901a9"
+  [lzDefinitions.Stage.TESTNET]: "0xe7723903288eb1a38fb7166edce4307dfce985c7a9771af579f4f3d003dda2ec",
+  [lzDefinitions.Stage.SANDBOX]: "0x7389aa98677cedbd03edf5201b389802f10e1d9e42e63b08958eb4f47fae37d7"
 };
 var PACKAGE_EXECUTOR_PTB_BUILDER_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x9d26806bb023ccd5b79d8ad50bf503e0e91c07b5bbfeb5b20a79e073571a5196",
-  [lzDefinitions.Stage.TESTNET]: "0x295c812b058677d0c0b5f5c5a7377054f0f955dfd129209ba6b73e72d6ebcb12",
-  [lzDefinitions.Stage.SANDBOX]: "0x05f93bd13f36cfcd54a1e464dbcf38d01563199ab9097fe10cc6edacf9e87856"
+  [lzDefinitions.Stage.TESTNET]: "0xafed5368176963fa0474724a019e4fae6643d31c06b653fa1364b2282d5049dd",
+  [lzDefinitions.Stage.SANDBOX]: "0xf77b3c5aa806c6d1ac4a90eb9c57cb9f2d681e0cc14aad9c45fd455795eaa949"
 };
 var PACKAGE_EXECUTOR_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x749420cc42b47d3db83fe316eb8accd8126bed9a779c0b7e06fa084c7fa1d76d",
-  [lzDefinitions.Stage.TESTNET]: "0xbc3c8b79290d6c235fce7e9c123b856fb268952d224df39a2b245f552028871f",
-  [lzDefinitions.Stage.SANDBOX]: "0xc70e979e617b6dceb54d2fd57fa74bbe0d5122afb245971d448c2355321450fa"
+  [lzDefinitions.Stage.TESTNET]: "0x5bcded2dfa21094d5ffdd6256a2a73984e901201e84a6783aa8233b187ffdb51",
+  [lzDefinitions.Stage.SANDBOX]: "0xa0eca8f1204a1b2b30f07c58584711ed5c18907aaf7b4c119d28a6f986303a3a"
 };
 var PACKAGE_ZRO_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xcdf19828a455468c4e4ffbd74ad641dddb58b49cd7d043da4cfa12f76c599d0a",
-  [lzDefinitions.Stage.TESTNET]: "0x91a4056ded4eae94ca27b35463a3b41f847377fb70da0930cc2d14ce7a8a1985",
+  [lzDefinitions.Stage.TESTNET]: "0x0f5b464ce3792d594954ea96262762a281dfbacf2f0714474adf8f84d68de929",
   [lzDefinitions.Stage.SANDBOX]: "0xce9cfe2dc60b2f45896a3c94a9af691c26b78ac4ce585ad7db429a3b6cc382c4"
 };
 var PACKAGE_CALL_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x26848d191c6b922a0bf185c4b3f6333179ce3b48df47d83fb112868bb65c2f37",
-  [lzDefinitions.Stage.TESTNET]: "0x49b718630acfdca4bbe7448ac982d5b98c09680e7ddcea0645856e4827a64780",
+  [lzDefinitions.Stage.TESTNET]: "0x05da1c3f28b024a7397c813863a286988c82f9d3d7bd0a3418737f44e38ded5f",
   [lzDefinitions.Stage.SANDBOX]: "0xd7f51d8b568d98158a635304c44f1235a95df746ef2d53e69f0c9f082912b3b8"
 };
 var PACKAGE_ENDPOINT_PTB_BUILDER_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x387af0542c79874a52c3e8812390c0fd02a8e947ce54aea8d80481ac2b5b3acb",
-  [lzDefinitions.Stage.TESTNET]: "0x22f9e772cfbe6f455430e731989cf5bf9e94a052010075d317ee3453965e7531",
-  [lzDefinitions.Stage.SANDBOX]: "0x6084d0757c8e1b3673d1f1af359325deb10c09b4fda03fa020dfe9ebf37fcfbc"
+  [lzDefinitions.Stage.TESTNET]: "0xe0a904685954e5dc73a720f6dd29c8b5a22d2d4ca0864536b7befaf4cec44676",
+  [lzDefinitions.Stage.SANDBOX]: "0x34dc069cfaca897c914dc7e4f6b187db6dca9057dc5ae9fdb32dbffdd494cf37"
 };
 var PACKAGE_SIMPLE_MESSAGE_LIB_PTB_BUILDER_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xba557037446a5b114205c868db114957945dd21df9770796fea2b558fc4a20fd",
-  [lzDefinitions.Stage.TESTNET]: "0xe6ed6863d420e51cf9d4635bffda5629d9d1127ac6d04befbdc4407319def4cf",
-  [lzDefinitions.Stage.SANDBOX]: "0x277c32d64b3163fa92c4fcfbd3acb4aceb9f7a3dd5f9b322931c8b97423b8c7b"
+  [lzDefinitions.Stage.TESTNET]: "0x4badf1bba6f630905bc413b89f1c22669593b0e7aea60012a14fd42f44e2a7fe",
+  [lzDefinitions.Stage.SANDBOX]: "0x06277f6dc34000229e58225f3696d0f8174167ec51a68d0840d40b68811468ae"
 };
 var PACKAGE_PTB_MOVE_CALL_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x0dd38c96b282271279247c26dba1f51d6e45209396a9e548154881e04549db66",
-  [lzDefinitions.Stage.TESTNET]: "0xb4f4197e5575de0ac3bb734c6e4319db756dccce406eac9e83532d6906f1ad13",
-  [lzDefinitions.Stage.SANDBOX]: "0x39d0fdb7cbdcdd47e4319f16e9f80a6197c96eebb7420bf50fa600e67f90cb47"
+  [lzDefinitions.Stage.TESTNET]: "0x8bdf374fe8576f28d71eecd219601cebafa38e2c79387eea92e2f27a71359197",
+  [lzDefinitions.Stage.SANDBOX]: "0xeb4d0c77dad48d13bc35dd58faaa1c21c31aeabf4379ab6f884c6c8558b53d9d"
 };
 var PACKAGE_DVN_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x6810f5568936a9a2b5fcb043f59a3cbf681e06f0db61c90bf3ff5530d4f470c0",
-  [lzDefinitions.Stage.TESTNET]: "0x469f0c9a2de4dedb06dd2c3c0f7bf7ef089b6241cd9f92e8351b7934eefa8911",
-  [lzDefinitions.Stage.SANDBOX]: "0x5427b5d3934439e44452ca4762207b6e9edc4ae06423302e27558f7df5bbca60"
+  [lzDefinitions.Stage.TESTNET]: "0x7c04479b475305685ad24fd3e91437aa3f6e0df95d1417fad1b4640d8363be9b",
+  [lzDefinitions.Stage.SANDBOX]: "0x3e4f47a79339dedf94886fa73f008645790deff8f77311a28fcb30b9c1d91c60"
 };
 var PACKAGE_DVN_FEE_LIB_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xb94f476ccd37034f4f5fb9c541320b85f86e61ae7f654fa66f3b987e8fb3f825",
-  [lzDefinitions.Stage.TESTNET]: "0xde03fbec539a2299369e217f9fe3f545f99f90ac1f569b734c9c34198b741a59",
-  [lzDefinitions.Stage.SANDBOX]: "0xe5fabd9432a0ebf42b8e427f5bba0c10380c0fc5275f839bac4d2a1dbc4408a4"
+  [lzDefinitions.Stage.TESTNET]: "0x7f6a8ca6e6f136605be10b502d4e03fda2ee9983f57c10c6199a63744977d951",
+  [lzDefinitions.Stage.SANDBOX]: "0x9457382d9ed65c3b7d96f8ca32866c432f3aca772de185cc7b0df0a08c13c14b"
 };
 var PACKAGE_EXECUTOR_FEE_LIB_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x4cdd97cf2dee8387b004915c293d0565577e0194fff4894e604a09db54ac62c7",
-  [lzDefinitions.Stage.TESTNET]: "0x70bbf3e074cacc6ff12828d61668b6c418a5f283acdb1fdb615b567ff9310e50",
-  [lzDefinitions.Stage.SANDBOX]: "0x6ff29a2477242ae53c7888b28584cbc5b4d37cbc7c61936c9ab39dd1e7baedb4"
+  [lzDefinitions.Stage.TESTNET]: "0x36a441e73ed70e9fc900d021381a3d833c8b15305b7a116dbd7a2d1a156432e1",
+  [lzDefinitions.Stage.SANDBOX]: "0xe864c9cf1690ba00d18dbfa6c706b06d6b2e70e223f11400e79ebf060ff0cac5"
 };
 var PACKAGE_PRICE_FEED_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x9f12f79a355fca76492bc1908fc7a9a8518d2a83e65cffc93f134144dfa4e5bb",
-  [lzDefinitions.Stage.TESTNET]: "0x8b5d94f396b4e83fac82402aaee7c718fa24ec9ae07ff3e35195a0f9703d9d27",
-  [lzDefinitions.Stage.SANDBOX]: "0x0eb49ee1a26037b32f17942918dc14eaecaffaf62fec11939c05913a40f07845"
+  [lzDefinitions.Stage.TESTNET]: "0x703efe3215e8249a490b4889d20bff10f09838d200835d53d056bbf30a80fe37",
+  [lzDefinitions.Stage.SANDBOX]: "0xa6db98425af6398a485a8dd9f9b21eefcc74aece57de250932b937a2bd7d6108"
 };
 var PACKAGE_TREASURY_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xcb8bc76ad2dde43cb83fe4f27a702df0874e99c047317251ee878893c17c83c5",
-  [lzDefinitions.Stage.TESTNET]: "0xc35f43cea1ffccbb421daebc3257f47bd52ab1f56146d67db8643cce53255e17",
-  [lzDefinitions.Stage.SANDBOX]: "0xa334aa9425b02a49c34f0dbc7e71625b4244b02d4253440765006746db8496b0"
+  [lzDefinitions.Stage.TESTNET]: "0x5589cb216e702c9d18c8864b75a233a8f8b4591156fff871c129519e95d5aa3e",
+  [lzDefinitions.Stage.SANDBOX]: "0x4338932a1659dd212cddbc7ef7dc610e5f9d430682a2706515ac62382fc911b5"
 };
 var PACKAGE_OAPP_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x7c93d6d8288fa0f8df5a595dcde2413b849d8c839fc59fc09243fd5bf44c96ab",
-  [lzDefinitions.Stage.TESTNET]: "0xd5a9d04da7af4dc6c09d9301a5fe6e07f7a478f4c28c17211a5a53e2495d2b09",
-  [lzDefinitions.Stage.SANDBOX]: "0x23ba25c6036f0e272795381aa9d99c9b4a7d26586b65df386f0e0c67aa45bb49"
+  [lzDefinitions.Stage.TESTNET]: "0x50d5a0038394ddff138900335e56315b2aed79475cad3fe3737a50dc12c884d6",
+  [lzDefinitions.Stage.SANDBOX]: "0x658d364c1a245c8e126cab40b215c77173cdab3288d56c4ce51158674a8204f4"
 };
 var PACKAGE_LAYERZERO_VIEWS_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x74803ac88036cbd57bf1a46347e22143a47081f7159efb01419f1ed14a17ad67",
-  [lzDefinitions.Stage.TESTNET]: "0x47ad1d6b2702030e46899e7e57747b72956c863b24b531ae9ec64a6b4a8f6a6c",
-  [lzDefinitions.Stage.SANDBOX]: "0x88fcf5002c4b9c4d8c3b2f97e5b6ce5977bcf447c03c477764182096eabaff03"
+  [lzDefinitions.Stage.TESTNET]: "0xa4a72308ec518a2103f9f31435d07df740736bc03b778ca1200071805c5414da",
+  [lzDefinitions.Stage.SANDBOX]: "0xb06760345da493b5f65040109ede722d93063614dedb0e34be7002153619615e"
 };
 var PACKAGE_DVN_LAYERZERO_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xc3f25fb140745ca0d4cde0ec382fd76e2f20d5a76a7fd9264340b4af949fd38b",
-  [lzDefinitions.Stage.TESTNET]: "0x4162ac95c378d7ecfc566332374da19959f77e7825359abe496ff175445e12fd",
-  [lzDefinitions.Stage.SANDBOX]: "0xab2677bf4b70953015681d960bce3e675022265f726edc6bbe8f1cecb195fb62"
+  [lzDefinitions.Stage.TESTNET]: "0x725e5c54d11578942f4b45ebdce1cc91244dae658a667c2186c277b6a5673f9c",
+  [lzDefinitions.Stage.SANDBOX]: "0x00ae2cd83670b2292f917a21dee2e268560167b1e44059cc583d43d3dcf7d0b2"
 };
 var PACKAGE_EXECUTOR_LAYERZERO_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x2111256b15f5d0a20f6352084dac268c737b47c113b4da5eacb316f8a536f9bf",
-  [lzDefinitions.Stage.TESTNET]: "0x54da0b9c6deb5ed73d469591289d0a9393efb92ca7749fefcf6476fbed7c35c3",
-  [lzDefinitions.Stage.SANDBOX]: "0x669d33e3944cfb7df9d4812aa8e7614689382de88f1dddedd958392f6f109c39"
+  [lzDefinitions.Stage.TESTNET]: "0xb8db282fff4358b67915bb76eb18bde3406e4e30a1d219c852c7ccf5a121a3ff",
+  [lzDefinitions.Stage.SANDBOX]: "0x4cdbc0ebf748f44bfd0f94cda6129f9e0dc4976bae9304338795440fc4239fd2"
 };
 var PACKAGE_PACKAGE_WHITELIST_VALIDATOR_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xbdce35f2801192bb218e47bb6e9cf08e136037b271157e8db8fdc9acf0bd225e",
-  [lzDefinitions.Stage.TESTNET]: "0x6a305271e1e63b07a53640939bc9e772321ba4849c452434882c9faf4fe32e6f",
-  [lzDefinitions.Stage.SANDBOX]: "0x779dc68bff462187be3fd4d2095c7bd531a4f97fd4d5620f73445bf35d97a1b6"
+  [lzDefinitions.Stage.TESTNET]: "0x5ad1acba7eb1b381ab3f08da17938ffa930375c0904e78ccd6e634957f6b3ef6",
+  [lzDefinitions.Stage.SANDBOX]: "0x1e1aa40e521c0192001957909dd522ff7b944b194d555644b755643d540a5193"
 };
 var PACKAGE_BLOCKED_MESSAGE_LIB_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x9f6107b708d7650b1484ae10cb98340af343f46bd63793ea91c2379bab9a7abb",
-  [lzDefinitions.Stage.TESTNET]: "0xfec99a17d192ecc98ac72907bd04ec653d29585839887477ccc020928cebd8c6",
-  [lzDefinitions.Stage.SANDBOX]: "0xf3b96f33bf1f233b426f41ef5f1801a9058dc6bba4f3fbddb1a2468b06540836"
+  [lzDefinitions.Stage.TESTNET]: "0xd3f0cab5eca2cfb870e5390b572e67ce1d0d96bc89d097d089914014bf581e5d",
+  [lzDefinitions.Stage.SANDBOX]: "0xf3564021638d705174b80c7917480b49b62284c92a516f599972c7c657533d64"
 };
 var PACKAGE_BLOCKED_MESSAGE_LIB_PTB_BUILDER_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xd90430a0b1b5bf932586d7d52e67e2242b1276ad7944b41c21acd4f950671335",
-  [lzDefinitions.Stage.TESTNET]: "0x1d9dd8a9ea6d5938c2c8012e58b4751ab10db6bd1e70f601e8bdde5185757b05",
-  [lzDefinitions.Stage.SANDBOX]: "0xaf17063a0d53bd71b3c027137d557297d629d9a404432d298a67dfeda9d1e3f4"
-};
-var PACKAGE_WORKER_REGISTRY_ADDRESS = {
-  [lzDefinitions.Stage.MAINNET]: "",
-  [lzDefinitions.Stage.TESTNET]: "0x3a164e62281ab73a8892405ca83e833d426357ef0dde30b72306e244210f290d",
-  [lzDefinitions.Stage.SANDBOX]: "0xbf1e087bc40af272f98519a31ac5e889b95b3112b6bf28e652909cd199141cdd"
-};
-var PACKAGE_WORKER_COMMON_ADDRESS = {
-  [lzDefinitions.Stage.MAINNET]: "0x6b29b0abf9da88be53a9ea1dfab8f600930b9ab6961eee65d67c1eecdd8cb695",
-  [lzDefinitions.Stage.TESTNET]: "0x33475e821ef7e2b4882d9d22008d8d0f1abb2554a86ee74e810270aa3d0b90da",
-  [lzDefinitions.Stage.SANDBOX]: "0x27d3deb156d4b0145608971a0f4a5409f6fb9ab6888757a2dcf954dcab36a2d5"
+  [lzDefinitions.Stage.TESTNET]: "0xf2c5b342b99544fbd225ed45a76096f7ed6199624d2f2f4d04b76e2afb84654e",
+  [lzDefinitions.Stage.SANDBOX]: "0x9b02a69ee4ea8841cf6203db30a34552429504b5cac88de024f93b42c354be31"
 };
 var OBJECT_ENDPOINT_V2_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xd84dfbd6b21f2a6e2d9ecfd8204d20a420f2528746381c2db29c2f4caae67fcd",
-  [lzDefinitions.Stage.TESTNET]: "0x0012f71dd167f08907811324cedabeb93deba4b12fe06b2a5666285c39a4932a",
-  [lzDefinitions.Stage.SANDBOX]: "0xdddcfdef4087b155b1b1652233c3a2c14a32a3750ba6fe0eced0a9873701f349"
+  [lzDefinitions.Stage.TESTNET]: "0xbba9beee809d8010f5dc1c3529d75708f1fbf2fa7bbf40bb6031a4bc8ae9c9b6",
+  [lzDefinitions.Stage.SANDBOX]: "0xcda0200851fd0a5c1feafe78bccac740579c15245a62b36b2f53468124b2c05d"
 };
 var OBJECT_SIMPLE_MESSAGE_LIB_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xd18907d32aa9e95fc2eed2d02fec562442877bec8680620c05fa5b3c110ccd81",
-  [lzDefinitions.Stage.TESTNET]: "0x7de29ab3ca94daddafcf6d9fb9e19b14a2f3764b0fc26edfa13967e77c080522",
-  [lzDefinitions.Stage.SANDBOX]: "0x7e7f8a94b8eabafd9cfd5e82fa5e24e126cfbbe5a06c34f4b4a52b5091b7a8e1"
+  [lzDefinitions.Stage.TESTNET]: "0xe893810a3399bf50ec4fd7affa931bcb66dbab21e37aff80b7ce73f25e78ac4f",
+  [lzDefinitions.Stage.SANDBOX]: "0xd926e5e7c3551f3da7c840ded2056f5322bf051859492075009835bfdd1875f0"
 };
 var OBJECT_SIMPLE_MESSAGE_LIB_ADMIN_CAP_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x617aceffed0b17cc5b5f5ad4cd1e8b9d965a9ef73a923b474e4763dec7c175f6",
-  [lzDefinitions.Stage.TESTNET]: "0xe1754962802be1002dfa9e21754d55b7a16178c9537cc3d974d51cb7e16b55a0",
-  [lzDefinitions.Stage.SANDBOX]: "0xc1f4902df71727d7ca6aff112cc40ee8a7c7516362c3b2dd4e050e3cb160fdda"
+  [lzDefinitions.Stage.TESTNET]: "0x3115ca5bf047a17629099b1845db595a42b4e7d5c5916439036c18d0afd7181b",
+  [lzDefinitions.Stage.SANDBOX]: "0x0c995f624010b1f5da9ae8ecf1571ae7bedf3eb1397513880138f203ab9ec482"
 };
 var OBJECT_SIMPLE_MESSAGE_LIB_PTB_BUILDER_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x2a0c8a426823cc7fcb89dd849810b42643fda344286d493d0ce8593d9b2be280",
-  [lzDefinitions.Stage.TESTNET]: "0x75ddd5f382fa1449075ea90817bcd0b73547641ae7adfcbe6e06e43cd2c6daac",
-  [lzDefinitions.Stage.SANDBOX]: "0x78b6707e33db9047411b6eae44017ad69467714e80496bc5b6bc4520cb18ebe0"
+  [lzDefinitions.Stage.TESTNET]: "0xacaa1b7ed87084cea9c593d1df4a76bfa0bce1b214559d79de8a9167705292a3",
+  [lzDefinitions.Stage.SANDBOX]: "0xdc0fae3db4a0d357d7c727c0d3986d2d19f659ec5bf48fe4091056b87cfa0214"
 };
 var OBJECT_ULN_302_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x7d140391ed97fcdb3f87aa13a7727b7354cb0a6ca2a3e7156f8b3767dd634266",
-  [lzDefinitions.Stage.TESTNET]: "0x87838a88139c53e6935166cd11caca7180d90cb753f2c125a83f894171803a3d",
-  [lzDefinitions.Stage.SANDBOX]: "0x433539ec685d61bc0f9a6e0d14ed4e66dd95b672db557ca7aee6efacf79fd67a"
+  [lzDefinitions.Stage.TESTNET]: "0xea27cd132fe6e4cad973f642f1450b0da2490b5350e6104365a7a48a3d97fb1e",
+  [lzDefinitions.Stage.SANDBOX]: "0x11912ed43188135c45f69b3947e837f96957c30bcb7c33084815aeb910740e29"
 };
 var OBJECT_ULN_302_ADMIN_CAP_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xece25d7e8aad8a6295a7821bd4b7f29896714c3fc8472a5e7dbb19d67ff77e00",
-  [lzDefinitions.Stage.TESTNET]: "0x1b47915d5e840ef0889da1d95af7f1f410eaa02d5e81b54ee8cf78734fa6508a",
-  [lzDefinitions.Stage.SANDBOX]: "0x253f2f4db3d8b3092e15649bec62fd5a39e2686912110a69f370bf71f2109abd"
+  [lzDefinitions.Stage.TESTNET]: "0x791622d24d7ec1c33beea371f7d2e1d8cffaaa6596a785f61684227ccd379270",
+  [lzDefinitions.Stage.SANDBOX]: "0x750ae0c9069131666463405502da42a97dbabcee852d9e661dcbbe40a033a926"
 };
 var OBJECT_ULN_302_VERIFICATION_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x2e672e3cb4f4992b3e790ce50c7b3e464a60633ca5f68de3039cc5f20116f6e7",
-  [lzDefinitions.Stage.TESTNET]: "0x71971d81ed09b09009ec389b03fd308917c07882d7ec81978e7e2299a90b2c63",
-  [lzDefinitions.Stage.SANDBOX]: "0x145e90d36679bcc28bdf099f0ae364594457da3e7dfd091e0dbf8f0b0532d9b4"
+  [lzDefinitions.Stage.TESTNET]: "0xf308d39e3bab9ec37019d955c31abac6b3e7444f915a77be203f92c1d6a9a67e",
+  [lzDefinitions.Stage.SANDBOX]: "0x0cfc1cd618291331a7627782536608c43fa0165149a5b9aba05bf2aaddf920fb"
 };
 var OBJECT_ULN_302_PTB_BUILDER_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xb41c8c88899debceb5982ff0333a0026bb68159758af8557ee1b12433f539ec8",
-  [lzDefinitions.Stage.TESTNET]: "0xea5800593783c5754c6b8a1005c7bd0b908a554b75a7926ab87e3dcfbfe69ac5",
-  [lzDefinitions.Stage.SANDBOX]: "0xa80ecf9676be2e5048cbd0d6142c08ebb3312cb895be7ecc24ae7162564c3593"
+  [lzDefinitions.Stage.TESTNET]: "0x44c82a3a33294c1ac36f1baf931f57ec0a60bb183b5474211b8397465e3dffac",
+  [lzDefinitions.Stage.SANDBOX]: "0xca27fab304e428da446b66756dfa24ea1d633cfa6db704d1b10fe20156cfa67b"
 };
 var OBJECT_TREASURY_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xa6fd139692050fb7fea2a5d924d5cc637b2b617982b1537b98ab51f6074a6335",
-  [lzDefinitions.Stage.TESTNET]: "0x48a8a2119af29b28baa972b1adcdff8208e055d94c59151a96c0c52536807056",
-  [lzDefinitions.Stage.SANDBOX]: "0xee3c59fa08c950ca7cb57dd92e7020f64724d03d92e56bfebf979f91e38c7c2a"
+  [lzDefinitions.Stage.TESTNET]: "0xa082a4eac93a7525738511f7a00816f982545296175e54be355f813eebe20691",
+  [lzDefinitions.Stage.SANDBOX]: "0x6d17fd9f1064b974d095251ff53717bbeb780b29156702809c9c3104827fa19d"
 };
 var OBJECT_TREASURY_ADMIN_CAP_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x6fafabbb6f8dd963fb926b2075de90ed86e550bc67c900768e6b4c6002bc2b7d",
-  [lzDefinitions.Stage.TESTNET]: "0x6153522a15c9fdd844b235339794778e211f48b45ea4f5956df0b581d5ec08a7",
-  [lzDefinitions.Stage.SANDBOX]: "0x36226c2101f9d566222b5f58930893a238f0c351022432cf0fc2f87ad38e677e"
+  [lzDefinitions.Stage.TESTNET]: "0x3ec6669b54589abb6d12aa338c4f2962a5d1ab835e6385242698f3efd9ae2582",
+  [lzDefinitions.Stage.SANDBOX]: "0x48a1c8e1de673691dc66320fe3caf2e8ccb292752fa2159b6e7140db575c29c8"
 };
 var OBJECT_BLOCKED_MESSAGE_LIB_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x48761f1a6591f4ad761f8ef9ec85ad6d5255805c35d4c9a90c97c40e7820aa85",
-  [lzDefinitions.Stage.TESTNET]: "0xb281c28be2d6cecfc00e829c13424585fc6cf214443725b3732105005c1b7f32",
-  [lzDefinitions.Stage.SANDBOX]: "0x593bc89ba1d8255c9752e75f83e8e75b3c3d5cf45311631ddfc5da56cefec196"
+  [lzDefinitions.Stage.TESTNET]: "0xcc83422f225aef3300596dae1119510cf56d620a686dc1e73c9db15c49d70e31",
+  [lzDefinitions.Stage.SANDBOX]: "0x4aa4ef7097190d05105bf2cdc9b2f5386566fca57f8d7a2d6a73371857a9e4ab"
 };
 var OBJECT_BLOCKED_MESSAGE_LIB_PTB_BUILDER_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xba9a66cdc77ae59264b7481e6d0d04426f380169b9afbb5176aaf58718fad6d1",
-  [lzDefinitions.Stage.TESTNET]: "0x78a5e5fbf784cba8e32393a560608089a7b26148be3d6bde7615294a92c04f71",
-  [lzDefinitions.Stage.SANDBOX]: "0x246f0936c5ce78d5ce2abc4abddb2aecdf3600c30f2ec75914dc53280b813288"
+  [lzDefinitions.Stage.TESTNET]: "0x28d0ec1e88734b94e38d2a8305cb89b9e81bdee41f71f4159166e99f058758c5",
+  [lzDefinitions.Stage.SANDBOX]: "0xbd20951baeab3e769bf2da0b546f206c2dd23d8c2842c7a65c9ac12bd43802b2"
 };
 var OBJECT_DISCOVERY_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "",
@@ -10839,48 +10086,48 @@ var OBJECT_DISCOVERY_ADDRESS = {
 };
 var OBJECT_COUNTER_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xe44f7b2ff80b8450e0d09ec84198dd22d9e2ad6e9c9688d2db605736b99ae965",
-  [lzDefinitions.Stage.TESTNET]: "0xa190d944a3cbb26e10bdfeaea0575ea102dc32e11468b84c2d3c5e43004279f6",
-  [lzDefinitions.Stage.SANDBOX]: "0x77329b170aea3a8007ddbf9e7146fc955059dd84dd2412b4f6cf9dc03019e63a"
+  [lzDefinitions.Stage.TESTNET]: "0x85e63925789db09ee8021dfa66cb61a31913861b4abf7d97689061cf113ca61a",
+  [lzDefinitions.Stage.SANDBOX]: "0x34c3bd241345e15c118bc310f87153e3f4e329236a6bd7f6639afd3854e10fd6"
 };
 var OBJECT_COUNTER_OAPP_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x84e16eed83a2e9787860bd0324a3a69adc9ec181e5f7f2bfcca11222c113414c",
-  [lzDefinitions.Stage.TESTNET]: "0xebf846f8612cae7f3c6d1d53a1871e15f4b4a5422b560a612fe2449544d2d20f",
-  [lzDefinitions.Stage.SANDBOX]: "0xf75b934bf45fcf304860938d36cb1cf2827901e1848695cf4bd500956dc2e264"
+  [lzDefinitions.Stage.TESTNET]: "0xf96322c7067fb9dbd77c7cc62bd35490dc86db507837b4310eacaef3b327ce75",
+  [lzDefinitions.Stage.SANDBOX]: "0x33d75362a4ab3c939d51754f18b3afdac5aa8b4f3af5ba9e9ad44b3351dca623"
 };
 var OBJECT_COUNTER_ADMIN_CAP_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x7c1250bbfb0e72ff58985112746d361ad729ac6f47a404c76d4e447b93b49984",
-  [lzDefinitions.Stage.TESTNET]: "0xcdcd914050c84c3f7cbe222a82227abdd3c2569057c6cafb351b967567eb3c16",
-  [lzDefinitions.Stage.SANDBOX]: "0x79194be6aae7a7f8e03c645622d7e8bb402f5ab4f9bc55952958c6299a32d1cc"
+  [lzDefinitions.Stage.TESTNET]: "0x63350eccf073e3b86ab7dd04566e8b62d4fa184f633ef383998b3230f66cc1de",
+  [lzDefinitions.Stage.SANDBOX]: "0x2b35a82ccdd841b38d468969dce5d090f00f07a1e713a1c802476402c7272bcd"
 };
 var OBJECT_ENDPOINT_ADMIN_CAP_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x78d0ef45ccf4e6247162c09aa73ea0bb59467057960c23fe41a976ca67e916ab",
-  [lzDefinitions.Stage.TESTNET]: "0xc936f9ef4fcf965ecf2ddc468493efdfbc0fa617e41a1bda3a290dc4bb8ee539",
-  [lzDefinitions.Stage.SANDBOX]: "0x1cbd6b57d81ec53aafe3b53083247e082095e7257158a3a553afee00f7936e10"
+  [lzDefinitions.Stage.TESTNET]: "0xe91a479f58bd7335f620d45488bc713fd0e25ac37c1c282a8150c301dac97453",
+  [lzDefinitions.Stage.SANDBOX]: "0xfab761dfade0a1f68d2dd9ceb8abfa8826be50ef91676eb47aa00ae8c9b86500"
 };
 var OBJECT_ENDPOINT_PTB_BUILDER_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x2954f9997631409cf067785477b800ced4a2a9ccc75032076f8129ee07ca2caa",
-  [lzDefinitions.Stage.TESTNET]: "0x694d451f4a8d1e736b26f93531e9a63b70c1e1911c265e0b8df5b503afe58829",
-  [lzDefinitions.Stage.SANDBOX]: "0xe07db4b6c6c1b20c7dd2b55a890e3167156626e02955087c808c4904dc0e6d12"
+  [lzDefinitions.Stage.TESTNET]: "0x060ba8cc7a0e858c138ff00391bfec71dc863ac7d35cb36b14f4e52987cb9542",
+  [lzDefinitions.Stage.SANDBOX]: "0x80da1c4617dc27755ef53a12a96056c461e75a6953b3e51d6780cff03e5f7f4d"
 };
 var OBJECT_ENDPOINT_PTB_BUILDER_ADMIN_CAP_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x2a705654d837e75ee88e1f03003cccf3faa9a683cf0434468745532cc55e148f",
-  [lzDefinitions.Stage.TESTNET]: "0x7dd332e1634cd56be0730309816d221989da141741f896c88f2c8e339ca8b2a2",
-  [lzDefinitions.Stage.SANDBOX]: "0x8574a9cb46cebddf2c4a925130e09d850c34d288753b45006a7202f4c0a2a8f7"
+  [lzDefinitions.Stage.TESTNET]: "0xd5da31144a1a30e4fea6ad9074b04fc732d95ee4f84575ade95ec524ee351abf",
+  [lzDefinitions.Stage.SANDBOX]: "0x1358128be7cd28bed08496242b9c5827dc57b046996a41a8b789e8ffb48aceda"
 };
 var OBJECT_DVN_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x607471cac2ed025cbb2874cd5a175e6000939747097bbd0ea89664c1fbe9672c",
-  [lzDefinitions.Stage.TESTNET]: "0x2f7ab74403cc4595bb2e5b9ce155a6352b102a4dc6c2e120706c6b0343664194",
-  [lzDefinitions.Stage.SANDBOX]: "0xe577ff4dabff41a2c20c70a1bf85c364c7dd0fa01409be6ade8230d14d652666"
+  [lzDefinitions.Stage.TESTNET]: "0xd97457fdd827f0b9d9c35cb9b6a8560364822c57545a10be53106dfc7c26f2b4",
+  [lzDefinitions.Stage.SANDBOX]: "0xb2a39ae5c222a62aa9a13374c151ad5a44c4b92ed8f037f2b2580c2b377955e1"
 };
 var OBJECT_DVN_CAP_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x67d3d9e3537fc8ad2efd674bdce3b7f98ba2892971ab91a6f3bb611844dcc2e1",
-  [lzDefinitions.Stage.TESTNET]: "0xf978cdc3465835ed83bc01e4442dcaa9bd8540e7de5c6b61d9f439b34af60653",
-  [lzDefinitions.Stage.SANDBOX]: "0x722429404745505c9bef1998f8c4e4a169125bef9ec87d38374a40a39e23fa3d"
+  [lzDefinitions.Stage.TESTNET]: "0x6b29694aaf32600eba62f0f91aed2c31a7c34540a513403f23351a8cd1372d3c",
+  [lzDefinitions.Stage.SANDBOX]: "0xb952d8b84fee0d99c5e20f25984703828f94f7a020363c304702bdf7f55eeada"
 };
 var OBJECT_DVN_FEE_LIB_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x5ff9119265b39b59260a7f1df2b7af5390f39fb33aeaf8b099e1ddc6673da1f0",
-  [lzDefinitions.Stage.TESTNET]: "0xa0095aeda7675cea13507f2cb9af0a4ee1be36474d4b685ce547e1339ed16da9",
-  [lzDefinitions.Stage.SANDBOX]: "0x328d55314644afeca37b8a7d348132ea4871091b643c04d36b223464cca22aef"
+  [lzDefinitions.Stage.TESTNET]: "0xc0f5802549ca974579ff193affff53a1566fffc1586f83584fc3432f85dc4859",
+  [lzDefinitions.Stage.SANDBOX]: "0x45096197e8d1565a969d853ec334b84b449e4199c5ccacb25817c5108772d846"
 };
 var OBJECT_DVN_FEE_LIB_ADMIN_CAP_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "",
@@ -10889,23 +10136,23 @@ var OBJECT_DVN_FEE_LIB_ADMIN_CAP_ADDRESS = {
 };
 var OBJECT_EXECUTOR_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0xf5848ad4863f3594a96b4af26ab8d47414e5d17a9da76db1ab1489f1db3a75ae",
-  [lzDefinitions.Stage.TESTNET]: "0x894d3682c5a1a21d56fd9be3588c50d2a67fec639c59dfdcbf06c36ea61600cb",
-  [lzDefinitions.Stage.SANDBOX]: "0x19fe721c2cd57896eff7be972e261c6057005d9dfa4ae1b625f61ec1d89ac410"
+  [lzDefinitions.Stage.TESTNET]: "0x69c3cd711b6730e699e2423a15f75c0fc9d96b3f6596bca140452184381a4abe",
+  [lzDefinitions.Stage.SANDBOX]: "0x3b2399477ed15d57ee04d54fc014f67c228bdd39c8c16494f98f19bcc8fe952b"
 };
 var OBJECT_EXECUTOR_CAP_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x4f86b866513949acb7728b33dc9334c9b0439c5f368f527b99db3cbf69a0282f",
-  [lzDefinitions.Stage.TESTNET]: "0x3e39349ef6c8b283421b0b8290c26982a1f90cef606d6aa49e9a7a730eaca3c4",
-  [lzDefinitions.Stage.SANDBOX]: "0xc6da172d659c9939a5cd80b3faab7d3ac84d3eb86c6e18b4ca05eb3b513cf648"
+  [lzDefinitions.Stage.TESTNET]: "0x19bf02f900658874be5cb12af901008420c8e09fce73bfd9359dd78914a33eda",
+  [lzDefinitions.Stage.SANDBOX]: "0x537fcdb67272fb0defbd65f56e877df2120522025032ed4e5df66efcb848e057"
 };
 var OBJECT_EXECUTOR_OWNER_CAP_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x26082897ee964836468287f28e091078257d4fa27a6b309321b3d171cef3850d",
-  [lzDefinitions.Stage.TESTNET]: "0x62c6091267bb19c3d7b7f0037b3f7f4fdad7ec6f9fd51dbe68db763802cca7ff",
-  [lzDefinitions.Stage.SANDBOX]: "0xbf5a6d1aef94b0777fefe5afe183a215e3d8f9a076cb472fb05a708fe7b3b599"
+  [lzDefinitions.Stage.TESTNET]: "0x6bbd9c69eaa8e52245a7c248c04847b0e1d31ed6945f5e2ada2e4d83c2f4c655",
+  [lzDefinitions.Stage.SANDBOX]: "0x52fb07f5997f1677307fcfba521ad24ddb4633ccfb047db863ab6c1ec280ef85"
 };
 var OBJECT_EXECUTOR_FEE_LIB_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x1d505d1cfdd0ac8938826269b93c35cec0cd97ba783e073fa3b0206b35ca0378",
-  [lzDefinitions.Stage.TESTNET]: "0x8054f02534e7cffa69c72f42897ad99299ce051f62aca2704cad4155c14dc457",
-  [lzDefinitions.Stage.SANDBOX]: "0xffb0f87c0e8dcd5561c70cb3ed99ad13faf872110eded36fff8e56d2c8a34371"
+  [lzDefinitions.Stage.TESTNET]: "0x8826aad865a485ec779b5f08c74c07dbad3063f58f7b66c5f099137af7024519",
+  [lzDefinitions.Stage.SANDBOX]: "0xbf426a5c517b839f00664c0bf9b5a5021ba8acdf8a24bf402a3f7d88c224e966"
 };
 var OBJECT_EXECUTOR_FEE_LIB_ADMIN_CAP_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "",
@@ -10914,23 +10161,18 @@ var OBJECT_EXECUTOR_FEE_LIB_ADMIN_CAP_ADDRESS = {
 };
 var OBJECT_PRICE_FEED_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x17a24b91f720a8f170386d920df3c605fe7a0b96e43424283b30b11ced0f0156",
-  [lzDefinitions.Stage.TESTNET]: "0x7cf7be28bbb5591751a4d487162667dab39a45a6d1d00cc4205bb991c35d0f00",
-  [lzDefinitions.Stage.SANDBOX]: "0x5666d8fe2a4cf9be4dad447451868978ccc12df37d8429b53f42a14b10ecc368"
+  [lzDefinitions.Stage.TESTNET]: "0x10e0e26966b7eee36e0009e67c0deeb8f7e5ea1a42ecefca53bf2d5d22031ba4",
+  [lzDefinitions.Stage.SANDBOX]: "0x58d4c62e24c842ad44eb1d890834de9b6c4c8dbf92c60bdae1ebb10ff655571e"
 };
 var OBJECT_PRICE_FEED_OWNER_CAP_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x809d4b17a59a2b832b9222b09d4d6d805b6b2aaf340b6a52babea814ef5637a4",
-  [lzDefinitions.Stage.TESTNET]: "0x53c00cb697e2f8e94fb9b227a17cfa706f51bad941a883b347f35285f3f53834",
-  [lzDefinitions.Stage.SANDBOX]: "0x47bea544df987ff5032a85b4788b2e6515dc4bcee5761a072b1689777dcb3185"
+  [lzDefinitions.Stage.TESTNET]: "0x6d42367426b654045c2c9eccf622caf43e552b3f983bbd293b1ef362e82504bd",
+  [lzDefinitions.Stage.SANDBOX]: "0x34a4563571d8bdde8a8158c0ac16b651d1c262f7872f4a90f6d79989d20abbb0"
 };
 var OBJECT_PACKAGE_WHITELIST_VALIDATOR_ADDRESS = {
   [lzDefinitions.Stage.MAINNET]: "0x9d29be17482e050324db3a4b10755e4adc5a1aa062ed80528e0fbe94654055b5",
-  [lzDefinitions.Stage.TESTNET]: "0x61d34f027d11e124b7602242c52bb53b6bbc783c2828b6652982583271a40a11",
-  [lzDefinitions.Stage.SANDBOX]: "0xf1adfa2fcffec0fdbb550d83dfed974db55b37e6787f57f331b68770982bc2b0"
-};
-var OBJECT_WORKER_REGISTRY_ADDRESS = {
-  [lzDefinitions.Stage.MAINNET]: "",
-  [lzDefinitions.Stage.TESTNET]: "0x7c6d7a6abd83d8b6efab42d7c087b1f8413c2553973a44e253a380f588793326",
-  [lzDefinitions.Stage.SANDBOX]: "0x55bb2926901fa69afb1466b39d0d9acb3a2ea15b0164b8770d05505781251c7a"
+  [lzDefinitions.Stage.TESTNET]: "0xcdbefbceffe2d9f0c0d46733ef4be0145e7af60241962738e98f136bff1557e2",
+  [lzDefinitions.Stage.SANDBOX]: "0x4e07c6ed9cefd6eb80a86bb99fdfc4c2cb3482fdfd0f2225fb96830dc2789cc7"
 };
 
 // src/resource.ts
@@ -10960,9 +10202,7 @@ var PACKAGE_ADDRESS_MAP = {
   treasury: PACKAGE_TREASURY_ADDRESS,
   oapp: PACKAGE_OAPP_ADDRESS,
   layerzeroViews: PACKAGE_LAYERZERO_VIEWS_ADDRESS,
-  packageWhitelistValidator: PACKAGE_PACKAGE_WHITELIST_VALIDATOR_ADDRESS,
-  workerRegistry: PACKAGE_WORKER_REGISTRY_ADDRESS,
-  workerCommon: PACKAGE_WORKER_COMMON_ADDRESS
+  packageWhitelistValidator: PACKAGE_PACKAGE_WHITELIST_VALIDATOR_ADDRESS
 };
 var OBJECT_ADDRESS_MAP = {
   endpointV2: OBJECT_ENDPOINT_V2_ADDRESS,
@@ -10992,8 +10232,7 @@ var OBJECT_ADDRESS_MAP = {
   executorFeeLib: OBJECT_EXECUTOR_FEE_LIB_ADDRESS,
   priceFeed: OBJECT_PRICE_FEED_ADDRESS,
   priceFeedOwnerCap: OBJECT_PRICE_FEED_OWNER_CAP_ADDRESS,
-  packageWhitelistValidator: OBJECT_PACKAGE_WHITELIST_VALIDATOR_ADDRESS,
-  workerRegistry: OBJECT_WORKER_REGISTRY_ADDRESS
+  packageWhitelistValidator: OBJECT_PACKAGE_WHITELIST_VALIDATOR_ADDRESS
 };
 var ResourceManager = class {
   /**
@@ -11065,8 +10304,8 @@ var SDK = class {
   getLayerZeroViews() {
     return this.moduleManager.getLayerZeroViews();
   }
-  getOApp(callCapId, options) {
-    return this.moduleManager.getOApp(this.client, callCapId, options);
+  getOApp() {
+    return this.moduleManager.getOApp();
   }
   // === Non-Core Module Getters (created on-demand with caching) ===
   getCounter(options) {
@@ -11114,9 +10353,6 @@ var SDK = class {
   getBlockedMessageLibPtbBuilder(options) {
     return this.moduleManager.getBlockedMessageLibPtbBuilder(this.client, options);
   }
-  getWorkerRegistry(options) {
-    return this.moduleManager.getWorkerRegistry(this.client, options);
-  }
   getOrCreateModule(moduleName, options, factory) {
     return this.moduleManager.getOrCreateModule(moduleName, options, factory);
   }
@@ -11140,7 +10376,6 @@ exports.DVN = DVN;
 exports.DVNErrorCode = DVNErrorCode;
 exports.DVNFeeLib = DVNFeeLib;
 exports.DVNFeeLibErrorCode = DVNFeeLibErrorCode;
-exports.DVNLayerzeroErrorCode = DVNLayerzeroErrorCode;
 exports.DstConfigBcs = DstConfigBcs;
 exports.DvnDstConfigBcs = DvnDstConfigBcs;
 exports.DvnLayerZero = DvnLayerZero;
@@ -11149,18 +10384,17 @@ exports.Endpoint = Endpoint;
 exports.EndpointErrorCode = EndpointErrorCode;
 exports.EndpointExecutionState = EndpointExecutionState;
 exports.EndpointPtbBuilder = EndpointPtbBuilder;
-exports.EndpointPtbBuilderErrorCode = EndpointPtbBuilderErrorCode;
 exports.Executor = Executor;
 exports.ExecutorConfigBcs = ExecutorConfigBcs;
 exports.ExecutorErrorCode = ExecutorErrorCode;
 exports.ExecutorFeeLib = ExecutorFeeLib;
 exports.ExecutorFeeLibErrorCode = ExecutorFeeLibErrorCode;
 exports.ExecutorLayerZero = ExecutorLayerZero;
-exports.ExecutorLayerzeroErrorCode = ExecutorLayerzeroErrorCode;
 exports.ExecutorOptionType = ExecutorOptionType;
 exports.ExecutorPtbBuilder = ExecutorPtbBuilder;
 exports.FunctionBCS = FunctionBCS;
 exports.LayerZeroViews = LayerZeroViews;
+exports.LibBuilderManagerErrorCode = LibBuilderManagerErrorCode;
 exports.LzComposeVersion = LzComposeVersion;
 exports.LzReceiveVersion = LzReceiveVersion;
 exports.LzTypeName = LzTypeName;
@@ -11176,8 +10410,6 @@ exports.NativeDropParamsBcs = NativeDropParamsBcs;
 exports.NonSenderObjectValidator = NonSenderObjectValidator;
 exports.OApp = OApp;
 exports.OAppErrorCode = OAppErrorCode;
-exports.OAppInfoV1Bcs = OAppInfoV1Bcs;
-exports.OAppInfoVersion = OAppInfoVersion;
 exports.OAppUlnConfigBcs = OAppUlnConfigBcs;
 exports.OBJECT_BLOCKED_MESSAGE_LIB_ADDRESS = OBJECT_BLOCKED_MESSAGE_LIB_ADDRESS;
 exports.OBJECT_BLOCKED_MESSAGE_LIB_PTB_BUILDER_ADDRESS = OBJECT_BLOCKED_MESSAGE_LIB_PTB_BUILDER_ADDRESS;
@@ -11210,7 +10442,6 @@ exports.OBJECT_ULN_302_ADDRESS = OBJECT_ULN_302_ADDRESS;
 exports.OBJECT_ULN_302_ADMIN_CAP_ADDRESS = OBJECT_ULN_302_ADMIN_CAP_ADDRESS;
 exports.OBJECT_ULN_302_PTB_BUILDER_ADDRESS = OBJECT_ULN_302_PTB_BUILDER_ADDRESS;
 exports.OBJECT_ULN_302_VERIFICATION_ADDRESS = OBJECT_ULN_302_VERIFICATION_ADDRESS;
-exports.OBJECT_WORKER_REGISTRY_ADDRESS = OBJECT_WORKER_REGISTRY_ADDRESS;
 exports.PACKAGE_BLOCKED_MESSAGE_LIB_ADDRESS = PACKAGE_BLOCKED_MESSAGE_LIB_ADDRESS;
 exports.PACKAGE_BLOCKED_MESSAGE_LIB_PTB_BUILDER_ADDRESS = PACKAGE_BLOCKED_MESSAGE_LIB_PTB_BUILDER_ADDRESS;
 exports.PACKAGE_CALL_ADDRESS = PACKAGE_CALL_ADDRESS;
@@ -11236,8 +10467,6 @@ exports.PACKAGE_TREASURY_ADDRESS = PACKAGE_TREASURY_ADDRESS;
 exports.PACKAGE_ULN_302_ADDRESS = PACKAGE_ULN_302_ADDRESS;
 exports.PACKAGE_ULN_302_PTB_BUILDER_ADDRESS = PACKAGE_ULN_302_PTB_BUILDER_ADDRESS;
 exports.PACKAGE_UTILS_ADDRESS = PACKAGE_UTILS_ADDRESS;
-exports.PACKAGE_WORKER_COMMON_ADDRESS = PACKAGE_WORKER_COMMON_ADDRESS;
-exports.PACKAGE_WORKER_REGISTRY_ADDRESS = PACKAGE_WORKER_REGISTRY_ADDRESS;
 exports.PACKAGE_ZRO_ADDRESS = PACKAGE_ZRO_ADDRESS;
 exports.PackageAllowlistValidator = PackageAllowlistValidator;
 exports.PackageWhitelistValidator = PackageWhitelistValidator;
@@ -11245,7 +10474,6 @@ exports.PriceBcs = PriceBcs;
 exports.PriceFeed = PriceFeed;
 exports.PriceFeedErrorCode = PriceFeedErrorCode;
 exports.PtbBuilder = PtbBuilder;
-exports.PtbBuilderErrorCode = PtbBuilderErrorCode;
 exports.SDK = SDK;
 exports.ShareObjectValidator = ShareObjectValidator;
 exports.SimpleMessageLib = SimpleMessageLib;
@@ -11257,7 +10485,6 @@ exports.TreasuryErrorCode = TreasuryErrorCode;
 exports.Uln302 = Uln302;
 exports.Uln302ErrorCode = Uln302ErrorCode;
 exports.Uln302PtbBuilder = Uln302PtbBuilder;
-exports.Uln302PtbBuilderErrorCode = Uln302PtbBuilderErrorCode;
 exports.UlnConfigBcs = UlnConfigBcs;
 exports.UlnVerificationState = UlnVerificationState;
 exports.UnclassifiedError = UnclassifiedError;
@@ -11265,8 +10492,6 @@ exports.Utils = Utils;
 exports.UtilsErrorCode = UtilsErrorCode;
 exports.ValidatorErrorCode = ValidatorErrorCode;
 exports.VectorMoveCallBCS = VectorMoveCallBCS;
-exports.WorkerRegistry = WorkerRegistry;
-exports.WorkerRegistryErrorCode = WorkerRegistryErrorCode;
 exports.Zro = Zro;
 exports.asAddress = asAddress;
 exports.asAddressVector = asAddressVector;