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

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @layerzerolabs/lz-solana-sdk-v2
 
+## 2.3.21
+
+### Patch Changes
+
+- 2a5e6c8: fix some bugs & public lz-solana-sdk-v2 & upgrade @solana/web3.js
+- Updated dependencies [2a5e6c8]
+  - @layerzerolabs/lz-corekit-solana@2.3.21
+  - @layerzerolabs/lz-definitions@2.3.21
+  - @layerzerolabs/lz-v2-utilities@2.3.21
+
 ## 2.3.20
 
 ### Patch Changes

package/deployments/solana-testnet/dvn-gcda.json

@@ -0,0 +1,9 @@
+{
+  "name": "dvn-gcda",
+  "network": "solana-testnet",
+  "address": "D5mVdHmD21yPS3p4utgp54wTUPqt7d7qCXt4oqCYsaBo",
+  "compatibleVersions": [
+    "v2"
+  ],
+  "deployer": "8Av75SWJqZtUt3Jm1NPLedAiQyGg4ayp6pf2AoWUhJ3n"
+}

package/dist/index.cjs

@@ -5,19 +5,18 @@ var BN6 = require('bn.js');
 var beet201 = require('@metaplex-foundation/beet');
 var beetSolana97 = require('@metaplex-foundation/beet-solana');
 var splToken = require('@solana/spl-token');
-var ethers = require('ethers');
+var bytes = require('@ethersproject/bytes');
+var keccak256 = require('@ethersproject/keccak256');
 var invariant2 = require('tiny-invariant');
 var address = require('@ethersproject/address');
-var bytes = require('@ethersproject/bytes');
 require('@ethersproject/abi');
 var bignumber = require('@ethersproject/bignumber');
 require('@ethersproject/solidity');
-var keccak256 = require('@ethersproject/keccak256');
 var lzCorekitSolana = require('@layerzerolabs/lz-corekit-solana');
 var lzDefinitions = require('@layerzerolabs/lz-definitions');
 var crypto = require('crypto');
+var sha2 = require('@ethersproject/sha2');
 var base58 = require('bs58');
-var utils = require('ethers/lib/utils');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -8695,7 +8694,7 @@ var Endpoint = class {
    */
   async getQuoteIXAccountMetaForCPI(connection, payer, path, msgLibProgram) {
     const { sender: sender_, dstEid, receiver: receiver_ } = path;
-    const sender = new web35.PublicKey(ethers.ethers.utils.arrayify(sender_));
+    const sender = new web35.PublicKey(bytes.arrayify(sender_));
     const receiver = addressToBytes32(receiver_);
     const sendLibInfo = await this.getSendLibrary(connection, sender, dstEid);
     if (!sendLibInfo?.programId) {
@@ -8735,7 +8734,7 @@ var Endpoint = class {
    */
   async getSendIXAccountMetaForCPI(connection, payer, path, msgLibProgram, commitmentOrConfig) {
     const { sender: sender_, dstEid, receiver: receiver_ } = path;
-    const sender = new web35.PublicKey(ethers.ethers.utils.arrayify(sender_));
+    const sender = new web35.PublicKey(bytes.arrayify(sender_));
     const receiver = addressToBytes32(receiver_);
     const info = await this.getSendLibrary(connection, sender, dstEid, commitmentOrConfig);
     if (!info?.programId) {
@@ -9287,7 +9286,7 @@ var Endpoint = class {
     return PayloadHash.fromAccountInfo(accountInfo, 0)[0];
   }
   async getComposedMessageState(connection, from, params, commitmentOrConfig) {
-    const message = ethers.ethers.utils.arrayify(ethers.ethers.utils.keccak256(params.message));
+    const message = bytes.arrayify(keccak256.keccak256(params.message));
     const [composedMessagePDA] = this.endpointDeriver.composedMessage(
       from,
       Uint8Array.from(params.guid),
@@ -13340,7 +13339,7 @@ var DVN = class {
   }
   getHashBytes(digest) {
     const [digestBytes] = executeTransactionDigestBeet.serialize(digest);
-    const hash = ethers.ethers.utils.keccak256(digestBytes);
+    const hash = keccak256.keccak256(digestBytes);
     return Buffer.from(hash.slice(2), "hex");
   }
   async invoke(connection, vid, payer, instruction, expiration, sign) {
@@ -15137,8 +15136,8 @@ var treasurySetEventBeet = new beet201__namespace.FixableBeetArgsStruct(
 function getEventDiscriminator(event) {
   const hash = crypto__default.default.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(
@@ -15359,7 +15358,7 @@ async function buildVersionedTransaction(connection, payerKey, instructions, com
   );
 }
 function instructionDiscriminator(method) {
-  return Buffer.from(ethers.ethers.utils.sha256(Buffer.from(`global:${method}`)).substring(2), "hex").subarray(0, 8);
+  return Buffer.from(sha2.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(
@@ -15384,11 +15383,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 web35.PublicKey(addressToBytes32(receiver_));
-  const message = ethers.ethers.utils.arrayify(message_);
+  const message = bytes.arrayify(message_);
   const params = {
     srcEid,
-    sender: Array.from(ethers.ethers.utils.arrayify(sender)),
-    guid: Array.from(ethers.ethers.utils.arrayify(guid)),
+    sender: Array.from(bytes.arrayify(sender)),
+    guid: Array.from(bytes.arrayify(guid)),
     message,
     callerParams,
     nonce: parseInt(packet.nonce)
@@ -16030,7 +16029,7 @@ var Executor = class {
     const receiver = new web35.PublicKey(addressToBytes32(receiver_));
     const receiverInfo = await connection.getParsedAccountInfo(receiver, commitmentOrConfig);
     const receiverProgram = new web35.PublicKey(receiverInfo.value.owner);
-    const message = ethers.ethers.utils.arrayify(message_);
+    const message = bytes.arrayify(message_);
     const accounts = await getLzReceiveAccounts(
       connection,
       executor,
@@ -16038,8 +16037,8 @@ var Executor = class {
       receiverProgram,
       {
         srcEid,
-        sender: Array.from(ethers.ethers.utils.arrayify(sender)),
-        guid: Array.from(ethers.ethers.utils.arrayify(guid)),
+        sender: Array.from(bytes.arrayify(sender)),
+        guid: Array.from(bytes.arrayify(guid)),
         message,
         callerParams: extraData,
         nonce: parseInt(packet.nonce)
@@ -16068,9 +16067,9 @@ var Executor = class {
           receiver,
           lzReceive: {
             srcEid,
-            sender: Array.from(ethers.ethers.utils.arrayify(sender)),
+            sender: Array.from(bytes.arrayify(sender)),
             nonce: parseInt(nonce),
-            guid: Array.from(ethers.ethers.utils.arrayify(guid)),
+            guid: Array.from(bytes.arrayify(guid)),
             message,
             extraData
           },
@@ -18988,7 +18987,7 @@ var Uln = class {
    */
   async getQuoteIXAccountMetaForCPI(connection, _payer, path, commitment) {
     const { sender: sender_, dstEid } = path;
-    const sender = new web35.PublicKey(ethers.ethers.utils.arrayify(sender_));
+    const sender = new web35.PublicKey(bytes.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);
@@ -19019,7 +19018,7 @@ var Uln = class {
    */
   async getSendIXAccountMetaForCPI(connection, payer, path, commitment = "confirmed") {
     const { sender: sender_, dstEid } = path;
-    const sender = new web35.PublicKey(ethers.ethers.utils.arrayify(sender_));
+    const sender = new web35.PublicKey(bytes.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);
@@ -19165,8 +19164,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 web35.PublicKey(ethers.ethers.utils.arrayify(packet.receiver()));
-    const sender = ethers.ethers.utils.arrayify(packet.sender());
+    const receiver = new web35.PublicKey(bytes.arrayify(packet.receiver()));
+    const sender = bytes.arrayify(packet.sender());
     const nonce = await endpoint.getNonce(connection, receiver, packet.srcEid(), sender, commitmentOrConfig);
     const pendingNonce = await endpoint.getPendingInboundNonce(
       connection,
@@ -19203,7 +19202,7 @@ var Uln = class {
     const packet = PacketV1Codec.fromBytes(packetBytes);
     const payloadHash = packet.payloadHash();
     const srcEid = packet.srcEid();
-    const receiver = new web35.PublicKey(ethers.ethers.utils.arrayify(packet.receiver()));
+    const receiver = new web35.PublicKey(bytes.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);
@@ -19237,7 +19236,7 @@ var Uln = class {
       },
       {
         params: {
-          packetHeader: Array.from(ethers.ethers.utils.arrayify(packet.header())),
+          packetHeader: Array.from(bytes.arrayify(packet.header())),
           payloadHash: Array.from(payloadHashBytes)
         }
       },
@@ -20895,9 +20894,9 @@ async function sendWithUln(connection, payer, tokenMint, tokenSource, dstEid, am
     payer,
     {
       srcEid: SOLANA_EID,
-      sender: ethers.ethers.utils.hexlify(oftInstance.toBytes()),
+      sender: bytes.hexlify(oftInstance.toBytes()),
       dstEid,
-      receiver: ethers.ethers.utils.hexlify(peerAddress)
+      receiver: bytes.hexlify(peerAddress)
     },
     messageLib
   );
@@ -21036,9 +21035,9 @@ async function quoteWithUln(connection, payer, tokenMint, dstEid, amountLd, minA
     payer,
     {
       srcEid: SOLANA_EID,
-      sender: ethers.ethers.utils.hexlify(oftInstance.toBytes()),
+      sender: bytes.hexlify(oftInstance.toBytes()),
       dstEid,
-      receiver: ethers.ethers.utils.hexlify(peerAddress)
+      receiver: bytes.hexlify(peerAddress)
     },
     messageLib
   );
@@ -21210,7 +21209,7 @@ async function getPeerAddress(connection, oftInstance, dstEid) {
     PROGRAM_ID
   );
   const peerinfo = await connection.getAccountInfo(peer);
-  return utils.hexlify(peerinfo.data.subarray(8, 32 + 8));
+  return bytes.hexlify(peerinfo.data.subarray(8, 32 + 8));
 }
 async function getDelegate(connection, oftInstance) {
   const [oAppRegistry] = web35.PublicKey.findProgramAddressSync(