@layerzerolabs/lz-solana-sdk-v2 3.0.67 → 3.0.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/lz-solana-sdk-v2",
-  "version": "3.0.67",
+  "version": "3.0.68",
   "license": "BUSL-1.1",
   "exports": {
     ".": {
@@ -39,12 +39,12 @@
     "test-uln": "TEST_SCOPES=uln anchor test --skip-build"
   },
   "dependencies": {
-    "@layerzerolabs/lz-corekit-solana": "^3.0.67",
-    "@layerzerolabs/lz-definitions": "^3.0.67",
-    "@layerzerolabs/lz-foundation": "^3.0.67",
-    "@layerzerolabs/lz-serdes": "^3.0.67",
-    "@layerzerolabs/lz-utilities": "^3.0.67",
-    "@layerzerolabs/lz-v2-utilities": "^3.0.67",
+    "@layerzerolabs/lz-corekit-solana": "^3.0.68",
+    "@layerzerolabs/lz-definitions": "^3.0.68",
+    "@layerzerolabs/lz-foundation": "^3.0.68",
+    "@layerzerolabs/lz-serdes": "^3.0.68",
+    "@layerzerolabs/lz-utilities": "^3.0.68",
+    "@layerzerolabs/lz-v2-utilities": "^3.0.68",
     "@metaplex-foundation/beet": "^0.7.1",
     "@metaplex-foundation/beet-solana": "^0.4.0",
     "@metaplex-foundation/umi": "^0.9.2",
@@ -66,8 +66,8 @@
     "@kinobi-so/renderers": "^0.21.3",
     "@kinobi-so/renderers-js-umi": "^0.21.6",
     "@layerzerolabs/layerzero-v2-solana": "^0.0.0",
-    "@layerzerolabs/tsup-config-next": "^3.0.67",
-    "@layerzerolabs/typescript-config-next": "^3.0.67",
+    "@layerzerolabs/tsup-config-next": "^3.0.68",
+    "@layerzerolabs/typescript-config-next": "^3.0.68",
     "@metaplex-foundation/umi-bundle-defaults": "^0.9.2",
     "@types/bn.js": "^5.1.5",
     "@types/chai": "^4.3.11",

package/src/next_nonce.ts

@@ -16,7 +16,7 @@ import { arrayify } from '@layerzerolabs/lz-utilities'
 import { Packet, addressToBytes32 } from '@layerzerolabs/lz-v2-utilities'
 
 import { EDDSA } from './pda'
-import { instructionDiscriminator, simulateWeb3JsTransaction } from './utility'
+import { instructionDiscriminator, simulateWeb3JsTransaction, toWeb3Connection } from './utility'
 
 // Data.
 export interface NextNonceInstructionData {
@@ -61,14 +61,7 @@ export async function nextNonce(
 ): Promise<bigint> {
     const { sender: sender_, srcEid, receiver: receiver_ } = packet
     const receiver = new web3.PublicKey(addressToBytes32(receiver_))
-    let connection: web3.Connection
-    if (rpc instanceof web3.Connection) {
-        connection = rpc
-    } else if ('connection' in rpc && rpc.connection instanceof web3.Connection) {
-        ;({ connection } = rpc)
-    } else {
-        throw new Error('Invalid connection')
-    }
+    const connection = toWeb3Connection(rpc)
     const receiverInfo = await connection.getAccountInfo(receiver)
     if (receiverInfo === null) {
         throw new Error(`Receiver account not found: ${receiver.toBase58()}`)

package/src/utility.ts

@@ -222,7 +222,7 @@ export async function extractWorkerFeePaidEventByTxHash(
  * @returns {Promise<E[] | null>} A promise that resolves to an array of events or null if not found.
  */
 export async function extractEventFromTransactionSignature<From, To extends From = From>(
-    connection: web3.Connection | RpcInterface,
+    rpc: web3.Connection | RpcInterface,
     _program: PublicKey | web3.PublicKey,
     signature: web3.TransactionSignature | web3.ParsedTransactionWithMeta | null,
     serializer: Serializer<From, To>,
@@ -237,13 +237,8 @@ export async function extractEventFromTransactionSignature<From, To extends From
     }
     let tx: web3.ParsedTransactionWithMeta | null
     if (typeof signature === 'string') {
-        if (connection instanceof web3.Connection) {
-            tx = await connection.getParsedTransaction(signature, commitment)
-        } else if ('connection' in connection && connection.connection instanceof web3.Connection) {
-            tx = await connection.connection.getParsedTransaction(signature, commitment)
-        } else {
-            throw new Error('Invalid connection')
-        }
+        const connection = toWeb3Connection(rpc)
+        tx = await connection.getParsedTransaction(signature, commitment)
     } else {
         tx = signature
     }
@@ -575,12 +570,8 @@ export async function simulateWeb3JsTransaction<From, To extends From = From>(
     let connection: web3.Connection
     if (typeof _connection === 'string') {
         connection = new web3.Connection(_connection, commitment)
-    } else if (_connection instanceof web3.Connection) {
-        connection = _connection
-    } else if ('connection' in _connection && _connection.connection instanceof web3.Connection) {
-        ;({ connection } = _connection)
     } else {
-        throw new Error('Invalid connection')
+        connection = toWeb3Connection(_connection)
     }
 
     let instructions: web3.TransactionInstruction[]
@@ -636,3 +627,13 @@ export async function simulateWeb3JsTransaction<From, To extends From = From>(
         return serializer.deserialize(resp, 0)[0]
     }
 }
+
+export function toWeb3Connection(rpc: RpcInterface | web3.Connection): web3.Connection {
+    if (rpc instanceof web3.Connection) {
+        return rpc
+    } else if ('connection' in rpc && rpc.connection instanceof web3.Connection) {
+        return rpc.connection
+    } else {
+        throw new Error('Invalid connection')
+    }
+}