@layerzerolabs/lz-solana-sdk-v2 2.3.20 → 2.3.21

package/dist/index.mjs

@@ -6,19 +6,18 @@ import { uniformFixedSizeArray, u8, FixableBeetArgsStruct, u32, u64, bytes, u16,
 import * as beetSolana97 from '@metaplex-foundation/beet-solana';
 import * as splToken from '@solana/spl-token';
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
-import { ethers } from 'ethers';
+import { arrayify, hexlify, hexZeroPad } from '@ethersproject/bytes';
+import { keccak256 } from '@ethersproject/keccak256';
 import invariant2 from 'tiny-invariant';
 import { getAddress } from '@ethersproject/address';
-import { arrayify, hexZeroPad, hexlify as hexlify$1 } from '@ethersproject/bytes';
 import '@ethersproject/abi';
 import { BigNumber } from '@ethersproject/bignumber';
 import '@ethersproject/solidity';
-import { keccak256 } from '@ethersproject/keccak256';
 import { signWithECDSA } from '@layerzerolabs/lz-corekit-solana';
 import { Environment, EndpointId } from '@layerzerolabs/lz-definitions';
 import crypto from 'crypto';
+import { sha256 } from '@ethersproject/sha2';
 import base58 from 'bs58';
-import { hexlify } from 'ethers/lib/utils';
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -2804,7 +2803,7 @@ function hexZeroPadTo32(addr) {
 }
 function bytes32ToEthAddress(bytes322) {
   if (bytes322 instanceof Uint8Array) {
-    bytes322 = hexlify$1(bytes322);
+    bytes322 = hexlify(bytes322);
   }
   return getAddress(bytes322.slice(-40));
 }
@@ -8667,7 +8666,7 @@ var Endpoint = class {
    */
   async getQuoteIXAccountMetaForCPI(connection, payer, path, msgLibProgram) {
     const { sender: sender_, dstEid, receiver: receiver_ } = path;
-    const sender = new PublicKey(ethers.utils.arrayify(sender_));
+    const sender = new PublicKey(arrayify(sender_));
     const receiver = addressToBytes32(receiver_);
     const sendLibInfo = await this.getSendLibrary(connection, sender, dstEid);
     if (!sendLibInfo?.programId) {
@@ -8707,7 +8706,7 @@ var Endpoint = class {
    */
   async getSendIXAccountMetaForCPI(connection, payer, path, msgLibProgram, commitmentOrConfig) {
     const { sender: sender_, dstEid, receiver: receiver_ } = path;
-    const sender = new PublicKey(ethers.utils.arrayify(sender_));
+    const sender = new PublicKey(arrayify(sender_));
     const receiver = addressToBytes32(receiver_);
     const info = await this.getSendLibrary(connection, sender, dstEid, commitmentOrConfig);
     if (!info?.programId) {
@@ -9259,7 +9258,7 @@ var Endpoint = class {
     return PayloadHash.fromAccountInfo(accountInfo, 0)[0];
   }
   async getComposedMessageState(connection, from, params, commitmentOrConfig) {
-    const message = ethers.utils.arrayify(ethers.utils.keccak256(params.message));
+    const message = arrayify(keccak256(params.message));
     const [composedMessagePDA] = this.endpointDeriver.composedMessage(
       from,
       Uint8Array.from(params.guid),
@@ -13312,7 +13311,7 @@ var DVN = class {
   }
   getHashBytes(digest) {
     const [digestBytes] = executeTransactionDigestBeet.serialize(digest);
-    const hash = ethers.utils.keccak256(digestBytes);
+    const hash = keccak256(digestBytes);
     return Buffer.from(hash.slice(2), "hex");
   }
   async invoke(connection, vid, payer, instruction, expiration, sign) {
@@ -15109,8 +15108,8 @@ var treasurySetEventBeet = new beet201.FixableBeetArgsStruct(
 function getEventDiscriminator(event) {
   const hash = crypto.createHash("sha256");
   hash.update(`event:${event}`);
-  const sha256 = hash.digest("hex");
-  return sha256.slice(0, 16);
+  const sha2562 = hash.digest("hex");
+  return sha2562.slice(0, 16);
 }
 async function extractSentPacketEventByTxHash(connection, program, signature, commitment) {
   const events = await extractEventFromTransactionSignature(
@@ -15331,7 +15330,7 @@ async function buildVersionedTransaction(connection, payerKey, instructions, com
   );
 }
 function instructionDiscriminator(method) {
-  return Buffer.from(ethers.utils.sha256(Buffer.from(`global:${method}`)).substring(2), "hex").subarray(0, 8);
+  return Buffer.from(sha256(Buffer.from(`global:${method}`)).substring(2), "hex").subarray(0, 8);
 }
 async function simulateTransaction(connection, instructions, programId, payer, commitment = "confirmed", blockhash, lookupTableAddress) {
   const tx = await buildVersionedTransaction(
@@ -15356,11 +15355,11 @@ async function simulateTransaction(connection, instructions, programId, payer, c
 async function lzReceive(connection, payer, packet, callerParams = Uint8Array.from([0, 0]), commitmentOrConfig) {
   const { message: message_, sender, srcEid, guid, receiver: receiver_ } = packet;
   const receiver = new PublicKey(addressToBytes32(receiver_));
-  const message = ethers.utils.arrayify(message_);
+  const message = arrayify(message_);
   const params = {
     srcEid,
-    sender: Array.from(ethers.utils.arrayify(sender)),
-    guid: Array.from(ethers.utils.arrayify(guid)),
+    sender: Array.from(arrayify(sender)),
+    guid: Array.from(arrayify(guid)),
     message,
     callerParams,
     nonce: parseInt(packet.nonce)
@@ -16002,7 +16001,7 @@ var Executor = class {
     const receiver = new PublicKey(addressToBytes32(receiver_));
     const receiverInfo = await connection.getParsedAccountInfo(receiver, commitmentOrConfig);
     const receiverProgram = new PublicKey(receiverInfo.value.owner);
-    const message = ethers.utils.arrayify(message_);
+    const message = arrayify(message_);
     const accounts = await getLzReceiveAccounts(
       connection,
       executor,
@@ -16010,8 +16009,8 @@ var Executor = class {
       receiverProgram,
       {
         srcEid,
-        sender: Array.from(ethers.utils.arrayify(sender)),
-        guid: Array.from(ethers.utils.arrayify(guid)),
+        sender: Array.from(arrayify(sender)),
+        guid: Array.from(arrayify(guid)),
         message,
         callerParams: extraData,
         nonce: parseInt(packet.nonce)
@@ -16040,9 +16039,9 @@ var Executor = class {
           receiver,
           lzReceive: {
             srcEid,
-            sender: Array.from(ethers.utils.arrayify(sender)),
+            sender: Array.from(arrayify(sender)),
             nonce: parseInt(nonce),
-            guid: Array.from(ethers.utils.arrayify(guid)),
+            guid: Array.from(arrayify(guid)),
             message,
             extraData
           },
@@ -18960,7 +18959,7 @@ var Uln = class {
    */
   async getQuoteIXAccountMetaForCPI(connection, _payer, path, commitment) {
     const { sender: sender_, dstEid } = path;
-    const sender = new PublicKey(ethers.utils.arrayify(sender_));
+    const sender = new PublicKey(arrayify(sender_));
     const { executorProgram, dvnPrograms } = await this.getWorkerPrograms(connection, sender, dstEid, commitment);
     const [defaultSendConfig] = this.deriver.defaultSendConfig(dstEid);
     const [sendConfig] = this.deriver.sendConfig(dstEid, sender);
@@ -18991,7 +18990,7 @@ var Uln = class {
    */
   async getSendIXAccountMetaForCPI(connection, payer, path, commitment = "confirmed") {
     const { sender: sender_, dstEid } = path;
-    const sender = new PublicKey(ethers.utils.arrayify(sender_));
+    const sender = new PublicKey(arrayify(sender_));
     const { executorProgram, dvnPrograms } = await this.getWorkerPrograms(connection, sender, dstEid, commitment);
     const [sendConfig] = this.deriver.sendConfig(dstEid, sender);
     const [defaultSendConfig] = this.deriver.defaultSendConfig(dstEid);
@@ -19137,8 +19136,8 @@ var Uln = class {
     const payloadHashBytes = Uint8Array.from(Buffer.from(payloadHash.slice(2), "hex"));
     const [confirmationsPDA] = this.deriver.confirmations(headerHashBytes, payloadHashBytes, dvn);
     const endpoint = new endpoint_exports.Endpoint(endpointProgram);
-    const receiver = new PublicKey(ethers.utils.arrayify(packet.receiver()));
-    const sender = ethers.utils.arrayify(packet.sender());
+    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,
@@ -19175,7 +19174,7 @@ var Uln = class {
     const packet = PacketV1Codec.fromBytes(packetBytes);
     const payloadHash = packet.payloadHash();
     const srcEid = packet.srcEid();
-    const receiver = new PublicKey(ethers.utils.arrayify(packet.receiver()));
+    const receiver = new PublicKey(arrayify(packet.receiver()));
     const payloadHashBytes = Uint8Array.from(Buffer.from(payloadHash.slice(2), "hex"));
     const [defaultReceiveConfig] = this.deriver.defaultReceiveConfig(srcEid);
     const [receiveConfig] = this.deriver.receiveConfig(srcEid, receiver);
@@ -19209,7 +19208,7 @@ var Uln = class {
       },
       {
         params: {
-          packetHeader: Array.from(ethers.utils.arrayify(packet.header())),
+          packetHeader: Array.from(arrayify(packet.header())),
           payloadHash: Array.from(payloadHashBytes)
         }
       },
@@ -20867,9 +20866,9 @@ async function sendWithUln(connection, payer, tokenMint, tokenSource, dstEid, am
     payer,
     {
       srcEid: SOLANA_EID,
-      sender: ethers.utils.hexlify(oftInstance.toBytes()),
+      sender: hexlify(oftInstance.toBytes()),
       dstEid,
-      receiver: ethers.utils.hexlify(peerAddress)
+      receiver: hexlify(peerAddress)
     },
     messageLib
   );
@@ -21008,9 +21007,9 @@ async function quoteWithUln(connection, payer, tokenMint, dstEid, amountLd, minA
     payer,
     {
       srcEid: SOLANA_EID,
-      sender: ethers.utils.hexlify(oftInstance.toBytes()),
+      sender: hexlify(oftInstance.toBytes()),
       dstEid,
-      receiver: ethers.utils.hexlify(peerAddress)
+      receiver: hexlify(peerAddress)
     },
     messageLib
   );