@layerzerolabs/lz-aptos-sdk-v1 2.0.14 → 2.0.15

package/dist/index.cjs

@@ -1972,10 +1972,60 @@ var Executor = class {
     );
     return typeInfos;
   }
-  async getLzReceivePayload(type_arguments, packet) {
-    const uaTypeInfo = await this.sdk.LayerzeroModule.Endpoint.getUATypeInfo(
-      aptos2__namespace.HexString.fromBuffer(packet.dst_address)
-    );
+  /**
+   * get lz_receive_types arguments by view function (tagged with #[view])
+   * 1. try UA::${module}::lz_receive_types, if failed, then
+   * 2. try UA::lz_receive::lz_receive_types by convention
+   * @param packet
+   * @param ledger_version
+   */
+  async getLzReceiveTypeArgumentsView(packet, ledger_version) {
+    const dstAddressHex = Buffer.from(packet.dst_address).toString("hex");
+    const uaAddress = aptos2__namespace.HexString.ensure(dstAddressHex);
+    const uaTypeInfo = await this.sdk.LayerzeroModule.Endpoint.getUATypeInfo(uaAddress);
+    const potentialModules = [uaTypeInfo.module_name, "lz_receive"];
+    for (const module of potentialModules) {
+      const payload = {
+        function: `${uaTypeInfo.account_address}::${module}::lz_receive_types`,
+        type_arguments: [],
+        arguments: [
+          `${packet.src_chain_id}`,
+          Buffer.from(packet.src_address).toString("hex"),
+          Buffer.from(packet.payload).toString("hex")
+        ]
+      };
+      try {
+        const ret = await this.sdk.client.view(payload, ledger_version);
+        const types = ret[0];
+        return [
+          types.map((t) => {
+            const account_address = fullAddress(t.account_address).toString();
+            const module_name = hexToAscii(t.module_name);
+            const struct_name = hexToAscii(t.struct_name);
+            return `${account_address}::${module_name}::${struct_name}`;
+          }),
+          {
+            account_address: uaTypeInfo.account_address,
+            module_name: module,
+            struct_name: uaTypeInfo.struct_name,
+            type: uaTypeInfo.type
+          }
+        ];
+      } catch (e) {
+        if (isErrorOfApiError(e, 400)) {
+          continue;
+        }
+        throw e;
+      }
+    }
+    throw new Error(`failed to get lz_receive_types arguments for ${uaAddress}`);
+  }
+  async getLzReceivePayload(type_arguments, packet, uaTypeInfo) {
+    if (!uaTypeInfo) {
+      uaTypeInfo = await this.sdk.LayerzeroModule.Endpoint.getUATypeInfo(
+        aptos2__namespace.HexString.fromBuffer(packet.dst_address)
+      );
+    }
     const transaction = {
       function: `${uaTypeInfo.account_address}::${uaTypeInfo.module_name}::lz_receive`,
       type_arguments,
@@ -1991,6 +2041,24 @@ var Executor = class {
     const transaction = await this.getLzReceivePayload(type_arguments, packet);
     return this.sdk.sendAndConfirmTransaction(signer, transaction);
   }
+  /**
+   * auto-detect lz_receive_types and call lz_receive
+   * @param signer
+   * @param packet
+   */
+  async lzReceiveNew(signer, packet) {
+    let transaction;
+    try {
+      const [typeArgs, uaTypeInfo] = await this.getLzReceiveTypeArgumentsView(packet);
+      transaction = await this.getLzReceivePayload(typeArgs, packet, uaTypeInfo);
+    } catch (e) {
+    }
+    if (!transaction) {
+      const typeArgs = await this.getLzReceiveTypeArguments(packet);
+      transaction = await this.getLzReceivePayload(typeArgs, packet);
+    }
+    return this.sdk.sendAndConfirmTransaction(signer, transaction);
+  }
   getShortRequestEventType() {
     return `${this.module}::RequestEvent`.replace(/^(0x)0*/i, "$1");
   }