@layerzerolabs/lz-solana-sdk-v2 2.3.11 → 2.3.12

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import * as web370 from '@solana/web3.js';
 import web370__default, { PublicKey, Keypair, AddressLookupTableProgram, VersionedTransaction, TransactionMessage, NONCE_ACCOUNT_LENGTH, Transaction, SystemProgram, NonceAccount, TransactionInstruction } from '@solana/web3.js';
-import { BN as BN$1 } from 'bn.js';
+import BN3, { BN as BN$1 } from 'bn.js';
 import { BN } from '@coral-xyz/anchor';
 import * as beet158 from '@metaplex-foundation/beet';
 import { uniformFixedSizeArray, u8, FixableBeetArgsStruct, u32, u64, bytes, u16, BeetArgsStruct, bool, array } from '@metaplex-foundation/beet';
@@ -6061,7 +6061,7 @@ var Endpoint = class {
     const [sendLibraryConfig] = this.endpointDeriver.sendLibraryConfig(oappIDPDA2, dstEid);
     const [sendLibraryInfo] = this.endpointDeriver.messageLibraryInfo(newSendLib);
     const [oappRegistry] = this.endpointDeriver.oappRegistry(oappIDPDA2);
-    return createSetSendLibraryInstruction(
+    const ix = createSetSendLibraryInstruction(
       {
         signer: oappAdmin,
         sendLibraryConfig,
@@ -6079,6 +6079,7 @@ var Endpoint = class {
       },
       this.program
     );
+    return Promise.resolve(ix);
   }
   async initReceiveLibrary(connection, delegate, receiver, srcEid, commitmentOrConfig) {
     const [oappRegistry] = this.endpointDeriver.oappRegistry(receiver);
@@ -6107,7 +6108,7 @@ var Endpoint = class {
     const [receiveLibraryConfig] = this.endpointDeriver.receiveLibraryConfig(oappIDPDA2, srcEid);
     const [receiveLibraryInfo] = this.endpointDeriver.messageLibraryInfo(newReceiveLib);
     const [oappRegistry] = this.endpointDeriver.oappRegistry(oappIDPDA2);
-    return createSetReceiveLibraryInstruction(
+    const ix = createSetReceiveLibraryInstruction(
       {
         signer: oappAdmin,
         receiveLibraryConfig,
@@ -6126,18 +6127,21 @@ var Endpoint = class {
       },
       this.program
     );
+    return Promise.resolve(ix);
   }
   async setOappConfig(connection, oappDelegate, oappID, msgLibProgram, eid, config, commitment = "confirmed") {
     const [msgLib] = new MessageLibPDADeriver(msgLibProgram).messageLib();
     const [msgLibInfo] = this.endpointDeriver.messageLibraryInfo(msgLib);
     const msgLibVersion = await this.getMessageLibVersion(connection, oappDelegate, msgLibProgram, commitment);
     let msgLibClient;
-    if (msgLibVersion?.major.toString() === "0" && msgLibVersion?.minor == 0 && msgLibVersion?.endpointVersion == 2) {
+    if (msgLibVersion?.major.toString() === "0" && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
       msgLibClient = new simple_message_lib_exports.SimpleMessageLib(msgLibProgram);
-    } else if (msgLibVersion?.major.toString() === "3" && msgLibVersion?.minor == 0 && msgLibVersion?.endpointVersion == 2) {
+    } else if (msgLibVersion?.major.toString() === "3" && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
       msgLibClient = new uln_exports.Uln(msgLibProgram);
     } else {
-      throw new Error(`unsupported message lib version ${msgLibVersion?.major}.${msgLibVersion?.minor}`);
+      throw new Error(
+        `unsupported message lib version ${msgLibVersion?.major.toString()}.${msgLibVersion?.minor.toString()}`
+      );
     }
     const [oappRegistry] = this.endpointDeriver.oappRegistry(oappID);
     const ix = createSetConfigInstruction(
@@ -6201,17 +6205,15 @@ var Endpoint = class {
       },
       this.program
     );
-    return new Promise((resolve) => {
-      resolve(
-        [
-          {
-            pubkey: this.program,
-            isSigner: false,
-            isWritable: false
-          }
-        ].concat(accounts)
-      );
-    });
+    return Promise.resolve(
+      [
+        {
+          pubkey: this.program,
+          isSigner: false,
+          isWritable: false
+        }
+      ].concat(accounts)
+    );
   }
   /***
    * Get the account meta of the send instruction for CPI(Cross-Program Invocation )
@@ -6266,7 +6268,7 @@ var Endpoint = class {
       [Buffer.from(OAPP_SEED, "utf-8"), receiver.toBuffer()],
       this.program
     );
-    return createSkipInstruction(
+    const ix = createSkipInstruction(
       {
         signer: payer,
         oappRegistry: oAppRegistry,
@@ -6282,11 +6284,12 @@ var Endpoint = class {
           receiver,
           srcEid,
           sender: Array.from(sender.toBytes()),
-          nonce
+          nonce: new BN3(nonce)
         }
       },
       this.program
     );
+    return Promise.resolve(ix);
   }
   async initVerify(connection, payer, sender, receiver, srcEid, nonce, commitmentOrConfig) {
     const [nonceAccount] = this.endpointDeriver.nonce(receiver, srcEid, addressToBytes32(sender.toBase58()));
@@ -6306,7 +6309,7 @@ var Endpoint = class {
           srcEid,
           sender: Array.from(sender.toBytes()),
           receiver,
-          nonce
+          nonce: new BN3(nonce)
         }
       },
       this.program
@@ -6321,7 +6324,7 @@ var Endpoint = class {
     const [receiveLibraryConfig] = this.endpointDeriver.receiveLibraryConfig(receiver, srcEid);
     const [nonce] = this.endpointDeriver.nonce(receiver, srcEid, sender);
     const [pendingNonce] = this.endpointDeriver.pendingNonce(receiver, srcEid, sender);
-    const ix = createVerifyInstruction(
+    const accounts = createVerifyInstructionAccounts(
       {
         receiveLibrary,
         receiveLibraryConfig,
@@ -6332,14 +6335,47 @@ var Endpoint = class {
         program: this.program,
         eventAuthority: this.eventAuthorityPDA
       },
-      // Fake params
+      this.program
+    );
+    accounts.forEach((key) => {
+      key.isSigner = false;
+    });
+    const program = {
+      pubkey: this.program,
+      isSigner: false,
+      isWritable: false
+    };
+    return [program, ...accounts];
+  }
+  /***
+   * setConfig is only supported by ULN
+   */
+  getSetConfigIXAccountMetaForCPI(connection, msgLibProgram, oappID, eid, commitmentOrConfig = "confirmed") {
+    const msgLib = msgLibProgram;
+    const [msgLibInfo] = this.endpointDeriver.messageLibraryInfo(msgLib);
+    const ix = createSetConfigInstruction(
+      {
+        signer: oappID,
+        messageLibInfo: msgLibInfo,
+        messageLib: msgLib,
+        messageLibProgram: msgLibProgram,
+        // anchorRemainingAccounts: await uln.getSetConfigIXAccountMetaForCPI( // FIXME: FIXME: uncomment this line later
+        //     connection,
+        //     this.program,
+        //     oappID,
+        //     eid,
+        //     commitmentOrConfig
+        // ),
+        oappRegistry: msgLib
+        // FIXME: oappRegistry is wrong
+      },
+      // Fake params. Just to get the ix.keys
       {
         params: {
-          srcEid,
-          sender: Array.from(addressToBytes32(packet.sender())),
-          receiver,
-          nonce: 1,
-          payloadHash: Array.from(addressToBytes32(packet.sender()))
+          eid,
+          configType: 1,
+          config: Uint8Array.from([]),
+          oapp: oappID
         }
       }
     );
@@ -6349,8 +6385,8 @@ var Endpoint = class {
     return [
       {
         pubkey: this.program,
-        isSigner: false,
-        isWritable: false
+        isWritable: false,
+        isSigner: false
       }
     ].concat(ix.keys);
   }
@@ -6693,7 +6729,7 @@ var Endpoint = class {
           const slot = await connection.getSlot();
           const timestamp = await connection.getBlockTime(slot);
           invariant(timestamp, "timestamp should not be null");
-          const isValid = timeout2.expiry > timestamp;
+          const isValid = parseInt(timeout2.expiry.toString()) > timestamp;
           return {
             programId: defaultInfo.messageLib,
             msgLib: defaultInfo.messageLib,
@@ -6716,7 +6752,7 @@ var Endpoint = class {
       const slot = await connection.getSlot();
       const timestamp = await connection.getBlockTime(slot);
       invariant(timestamp, "timestamp should not be null");
-      const isValid = timeout.expiry > timestamp;
+      const isValid = parseInt(timeout.expiry.toString()) > timestamp;
       return {
         programId: messageLibInfo.owner,
         msgLib: info.messageLib,
@@ -6758,6 +6794,14 @@ var Endpoint = class {
       return null;
     }
   }
+  async getPendingInboundNonce(connection, oappIDPDA2, remoteEid, remoteOappAddr, commitmentOrConfig) {
+    const [nonce] = this.endpointDeriver.pendingNonce(oappIDPDA2, remoteEid, remoteOappAddr);
+    try {
+      return await PendingInboundNonce.fromAccountAddress(connection, nonce, commitmentOrConfig);
+    } catch (e) {
+      return null;
+    }
+  }
   async getMessageLibVersion(connection, payer, messageLibProgram, commitment = "confirmed") {
     const ix = simple_message_lib_exports.instructions.createVersionInstruction(messageLibProgram);
     const simulateResp = await simulateTransaction(connection, [ix], messageLibProgram, payer, commitment);
@@ -10854,7 +10898,7 @@ var DVN = class {
   _getExpiration() {
     return (/* @__PURE__ */ new Date()).getTime() / 1e3 + 120;
   }
-  async setMsgLibs(connection, payer, msgLibs, sign) {
+  setMsgLibs(connection, payer, msgLibs, sign) {
     const expiration = this._getExpiration();
     return this.invoke(connection, this.vid, payer, this.createSetMsgLibsInstruction(msgLibs), expiration, sign);
   }
@@ -15772,7 +15816,7 @@ var Uln = class {
   /**
    * before calling this function, you should call initUln to initialize the uln
    */
-  async setTreasury(admin, treasury, treasuryFeeCap) {
+  async setTreasury(admin, treasury) {
     const [setting] = this.deriver.setting();
     const ix = createSetTreasuryInstruction(
       {
@@ -15990,14 +16034,47 @@ var Uln = class {
       this.program
     );
   }
-  async isVerified(connection, dvn, packetBytes) {
+  async isDvnVerified(connection, endpointProgram, dvn, packetBytes, commitmentOrConfig = "confirmed") {
     const packet = PacketV1Codec.fromBytes(packetBytes);
     const headerHash = packet.headerHash();
     const headerHashBytes = Uint8Array.from(Buffer.from(headerHash.slice(2), "hex"));
     const payloadHash = packet.payloadHash();
     const payloadHashBytes = Uint8Array.from(Buffer.from(payloadHash.slice(2), "hex"));
     const [confirmationsPDA] = this.deriver.confirmations(headerHashBytes, payloadHashBytes, dvn);
-    return await connection.getAccountInfo(confirmationsPDA) !== null;
+    const endpoint = new endpoint_exports.Endpoint(endpointProgram);
+    const receiver = new PublicKey(arrayify(packet.receiver()));
+    const sender = arrayify(packet.sender());
+    const nonce = await endpoint.getNonce(connection, receiver, packet.srcEid(), sender, commitmentOrConfig);
+    const pendingNonce = await endpoint.getPendingInboundNonce(
+      connection,
+      receiver,
+      packet.srcEid(),
+      sender,
+      commitmentOrConfig
+    );
+    if (!nonce || !pendingNonce) {
+      return false;
+    }
+    if (parseInt(nonce.inboundNonce.toString()) >= parseInt(packet.nonce())) {
+      return true;
+    }
+    if (pendingNonce.nonces.find((n) => n.toString() === packet.nonce()) !== void 0) {
+      return true;
+    }
+    try {
+      const confirmation = await Confirmations.fromAccountAddress(
+        connection,
+        confirmationsPDA,
+        commitmentOrConfig
+      );
+      if (confirmation.value === null) {
+        return false;
+      } else {
+        return true;
+      }
+    } catch (e) {
+      return false;
+    }
   }
   async commitVerification(connection, endpointProgram, packetBytes) {
     const packet = PacketV1Codec.fromBytes(packetBytes);