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

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @layerzerolabs/lz-solana-sdk-v2
 
+## 2.3.12
+
+### Patch Changes
+
+- 2761d43: minor update & fix some bugs
+- Updated dependencies [2761d43]
+  - @layerzerolabs/lz-corekit-solana@2.3.12
+  - @layerzerolabs/lz-definitions@2.3.12
+  - @layerzerolabs/lz-utilities@2.3.12
+  - @layerzerolabs/lz-v2-utilities@2.3.12
+
 ## 2.3.11
 
 ### Patch Changes

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var web370 = require('@solana/web3.js');
-var bn_js = require('bn.js');
+var BN3 = require('bn.js');
 var anchor = require('@coral-xyz/anchor');
 var beet158 = require('@metaplex-foundation/beet');
 var beetSolana66 = require('@metaplex-foundation/beet-solana');
@@ -39,6 +39,7 @@ function _interopNamespace(e) {
 }
 
 var web370__namespace = /*#__PURE__*/_interopNamespace(web370);
+var BN3__default = /*#__PURE__*/_interopDefault(BN3);
 var beet158__namespace = /*#__PURE__*/_interopNamespace(beet158);
 var beetSolana66__namespace = /*#__PURE__*/_interopNamespace(beetSolana66);
 var invariant__default = /*#__PURE__*/_interopDefault(invariant);
@@ -195,7 +196,7 @@ var EndpointPDADeriver = class {
       [
         Buffer.from(SEND_LIBRARY_CONFIG_SEED, "utf8"),
         // U32 to Uint8Array([0,0,0,0])
-        new bn_js.BN(dstEndpointId).toArrayLike(Buffer, "be", 4)
+        new BN3.BN(dstEndpointId).toArrayLike(Buffer, "be", 4)
       ],
       this.program
     );
@@ -206,7 +207,7 @@ var EndpointPDADeriver = class {
         Buffer.from(SEND_LIBRARY_CONFIG_SEED, "utf8"),
         sender.toBytes(),
         // U32 to Uint8Array([0,0,0,0])
-        new bn_js.BN(dstEndpointId).toArrayLike(Buffer, "be", 4)
+        new BN3.BN(dstEndpointId).toArrayLike(Buffer, "be", 4)
       ],
       this.program
     );
@@ -225,7 +226,7 @@ var EndpointPDADeriver = class {
       [
         Buffer.from(RECEIVE_LIBRARY_CONFIG_SEED, "utf8"),
         // U32 to Uint8Array([0,0,0,0])
-        new bn_js.BN(srcEndpointId).toArrayLike(Buffer, "be", 4)
+        new BN3.BN(srcEndpointId).toArrayLike(Buffer, "be", 4)
       ],
       this.program
     );
@@ -236,7 +237,7 @@ var EndpointPDADeriver = class {
         Buffer.from(RECEIVE_LIBRARY_CONFIG_SEED, "utf8"),
         receiver.toBytes(),
         // U32 to Uint8Array([0,0,0,0])
-        new bn_js.BN(srcEndpointId).toArrayLike(Buffer, "be", 4)
+        new BN3.BN(srcEndpointId).toArrayLike(Buffer, "be", 4)
       ],
       this.program
     );
@@ -264,7 +265,7 @@ var EndpointPDADeriver = class {
         Buffer.from(NONCE_SEED, "utf8"),
         localOapp.toBytes(),
         // U32 to Uint8Array([0,0,0,0])
-        new bn_js.BN(remoteChainId).toArrayLike(Buffer, "be", 4),
+        new BN3.BN(remoteChainId).toArrayLike(Buffer, "be", 4),
         remoteOapp
       ],
       this.program
@@ -275,7 +276,7 @@ var EndpointPDADeriver = class {
       [
         Buffer.from(PENDING_NONCE_SEED, "utf8"),
         localOapp.toBytes(),
-        new bn_js.BN(remoteChainId).toArrayLike(Buffer, "be", 4),
+        new BN3.BN(remoteChainId).toArrayLike(Buffer, "be", 4),
         remoteOapp
       ],
       this.program
@@ -300,9 +301,9 @@ var EndpointPDADeriver = class {
       [
         Buffer.from(PAYLOAD_HASH_SEED, "utf8"),
         receiver.toBytes(),
-        new bn_js.BN(srcEid).toArrayLike(Buffer, "be", 4),
+        new BN3.BN(srcEid).toArrayLike(Buffer, "be", 4),
         sender,
-        new bn_js.BN(nonce).toArrayLike(Buffer, "be", 8)
+        new BN3.BN(nonce).toArrayLike(Buffer, "be", 8)
       ],
       this.program
     );
@@ -314,7 +315,7 @@ var EndpointPDADeriver = class {
         from.toBytes(),
         to.toBytes(),
         guid,
-        new bn_js.BN(index).toArrayLike(Buffer, "be", 2),
+        new BN3.BN(index).toArrayLike(Buffer, "be", 2),
         messageHash
       ],
       this.program
@@ -330,13 +331,13 @@ var MessageLibPDADeriver = class {
   }
   sendConfig(eid, oapp) {
     return web370.PublicKey.findProgramAddressSync(
-      [Buffer.from(SEND_CONFIG_SEED, "utf8"), new bn_js.BN(eid).toArrayLike(Buffer, "be", 4), oapp.toBuffer()],
+      [Buffer.from(SEND_CONFIG_SEED, "utf8"), new BN3.BN(eid).toArrayLike(Buffer, "be", 4), oapp.toBuffer()],
       this.program
     );
   }
   receiveConfig(eid, oapp) {
     return web370.PublicKey.findProgramAddressSync(
-      [Buffer.from(RECEIVE_CONFIG_SEED, "utf8"), new bn_js.BN(eid).toArrayLike(Buffer, "be", 4), oapp.toBuffer()],
+      [Buffer.from(RECEIVE_CONFIG_SEED, "utf8"), new BN3.BN(eid).toArrayLike(Buffer, "be", 4), oapp.toBuffer()],
       this.program
     );
   }
@@ -347,25 +348,25 @@ var UlnPDADeriver = class extends MessageLibPDADeriver {
   }
   config(eid) {
     return web370.PublicKey.findProgramAddressSync(
-      [Buffer.from(ULN_CONFIG_SEED, "utf8"), new bn_js.BN(eid).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(ULN_CONFIG_SEED, "utf8"), new BN3.BN(eid).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
   defaultSendConfig(eid) {
     return web370.PublicKey.findProgramAddressSync(
-      [Buffer.from(SEND_CONFIG_SEED, "utf8"), new bn_js.BN(eid).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(SEND_CONFIG_SEED, "utf8"), new BN3.BN(eid).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
   defaultReceiveConfig(eid) {
     return web370.PublicKey.findProgramAddressSync(
-      [Buffer.from(RECEIVE_CONFIG_SEED, "utf8"), new bn_js.BN(eid).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(RECEIVE_CONFIG_SEED, "utf8"), new BN3.BN(eid).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
   options(eit) {
     return web370.PublicKey.findProgramAddressSync(
-      [Buffer.from(OPTIONS_SEED, "utf8"), new bn_js.BN(eit).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(OPTIONS_SEED, "utf8"), new BN3.BN(eit).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
@@ -385,7 +386,7 @@ var OAppBasePDADeriver = class {
   }
   remote(dstChainId) {
     return web370.PublicKey.findProgramAddressSync(
-      [Buffer.from(REMOTE_SEED), new bn_js.BN(dstChainId).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(REMOTE_SEED), new BN3.BN(dstChainId).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
@@ -406,7 +407,7 @@ var OmniCounterPDADeriver = class extends OAppBasePDADeriver {
   }
   remote(dstChainId) {
     return web370.PublicKey.findProgramAddressSync(
-      [Buffer.from(REMOTE_SEED), this.count()[0].toBytes(), new bn_js.BN(dstChainId).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(REMOTE_SEED), this.count()[0].toBytes(), new BN3.BN(dstChainId).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
@@ -470,13 +471,13 @@ var OftPDADeriver = class {
   }
   enforcedOptions(oftConfig, eid) {
     return web370.PublicKey.findProgramAddressSync(
-      [Buffer.from(ENFORCED_OPTIONS_SEED, "utf8"), oftConfig.toBytes(), new bn_js.BN(eid).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(ENFORCED_OPTIONS_SEED, "utf8"), oftConfig.toBytes(), new BN3.BN(eid).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
   peer(oftConfig, eid) {
     return web370.PublicKey.findProgramAddressSync(
-      [Buffer.from(PEER_SEED, "utf8"), oftConfig.toBytes(), new bn_js.BN(eid).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(PEER_SEED, "utf8"), oftConfig.toBytes(), new BN3.BN(eid).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
@@ -6091,7 +6092,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,
@@ -6109,6 +6110,7 @@ var Endpoint = class {
       },
       this.program
     );
+    return Promise.resolve(ix);
   }
   async initReceiveLibrary(connection, delegate, receiver, srcEid, commitmentOrConfig) {
     const [oappRegistry] = this.endpointDeriver.oappRegistry(receiver);
@@ -6137,7 +6139,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,
@@ -6156,18 +6158,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(
@@ -6231,17 +6236,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 )
@@ -6296,7 +6299,7 @@ var Endpoint = class {
       [Buffer.from(OAPP_SEED, "utf-8"), receiver.toBuffer()],
       this.program
     );
-    return createSkipInstruction(
+    const ix = createSkipInstruction(
       {
         signer: payer,
         oappRegistry: oAppRegistry,
@@ -6312,11 +6315,12 @@ var Endpoint = class {
           receiver,
           srcEid,
           sender: Array.from(sender.toBytes()),
-          nonce
+          nonce: new BN3__default.default(nonce)
         }
       },
       this.program
     );
+    return Promise.resolve(ix);
   }
   async initVerify(connection, payer, sender, receiver, srcEid, nonce, commitmentOrConfig) {
     const [nonceAccount] = this.endpointDeriver.nonce(receiver, srcEid, lzV2Utilities.addressToBytes32(sender.toBase58()));
@@ -6336,7 +6340,7 @@ var Endpoint = class {
           srcEid,
           sender: Array.from(sender.toBytes()),
           receiver,
-          nonce
+          nonce: new BN3__default.default(nonce)
         }
       },
       this.program
@@ -6351,7 +6355,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,
@@ -6362,14 +6366,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(lzV2Utilities.addressToBytes32(packet.sender())),
-          receiver,
-          nonce: 1,
-          payloadHash: Array.from(lzV2Utilities.addressToBytes32(packet.sender()))
+          eid,
+          configType: 1,
+          config: Uint8Array.from([]),
+          oapp: oappID
         }
       }
     );
@@ -6379,8 +6416,8 @@ var Endpoint = class {
     return [
       {
         pubkey: this.program,
-        isSigner: false,
-        isWritable: false
+        isWritable: false,
+        isSigner: false
       }
     ].concat(ix.keys);
   }
@@ -6723,7 +6760,7 @@ var Endpoint = class {
           const slot = await connection.getSlot();
           const timestamp = await connection.getBlockTime(slot);
           invariant__default.default(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,
@@ -6746,7 +6783,7 @@ var Endpoint = class {
       const slot = await connection.getSlot();
       const timestamp = await connection.getBlockTime(slot);
       invariant__default.default(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,
@@ -6788,6 +6825,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);
@@ -10884,7 +10929,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);
   }
@@ -15802,7 +15847,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(
       {
@@ -16014,20 +16059,53 @@ var Uln = class {
         params: {
           packetHeader: Array.from(Uint8Array.from(Buffer.from(packet.header().slice(2), "hex"))),
           payloadHash: Array.from(payloadHashBytes),
-          confirmations: typeof confirmations === "string" ? new bn_js.BN(confirmations) : confirmations
+          confirmations: typeof confirmations === "string" ? new BN3.BN(confirmations) : confirmations
         }
       },
       this.program
     );
   }
-  async isVerified(connection, dvn, packetBytes) {
+  async isDvnVerified(connection, endpointProgram, dvn, packetBytes, commitmentOrConfig = "confirmed") {
     const packet = lzV2Utilities.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 web370.PublicKey(utils.arrayify(packet.receiver()));
+    const sender = utils.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 = lzV2Utilities.PacketV1Codec.fromBytes(packetBytes);