Merge branch 'main' into init-solana-tests

Author: nazreen

.changeset/brown-icons-push.md

@@ -0,0 +1,6 @@
+---
+"@layerzerolabs/hyperliquid-composer": patch
+"@layerzerolabs/oft-hyperliquid-example": patch
+---
+
+rename FeeAbstraction to PreFundedFeeAbstraction in docs

.github/dependabot.yaml

@@ -0,0 +1,24 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directories:
+      - "/"
+      - "/packages/*"
+      - "/examples/*"
+
+    schedule:
+      interval: "daily"
+
+    # Keep at most one open Dependabot PR at a time
+    open-pull-requests-limit: 1
+
+    # Only update this single public package
+    allow:
+      - dependency-name: "@layerzerolabs/lz-definitions"
+        dependency-type: "direct"
+
+    # Grouping is redundant with the allow-list, but harmless and keeps naming consistent
+    groups:
+      lz-definitions:
+        patterns:
+          - "@layerzerolabs/lz-definitions"

.github/workflows/reusable-test.yaml

@@ -162,16 +162,6 @@ jobs:
       - name: Setup build cache
         uses: ./.github/workflows/actions/setup-build-cache
 
-      - name: E2E Test Notice
-        run: |
-          echo "::notice::🧪 E2E tests are non-blocking and run against live networks"
-          echo "::notice::These tests validate real blockchain interactions but may fail due to:"
-          echo "::notice::  - Network connectivity issues"
-          echo "::notice::  - RPC rate limiting"
-          echo "::notice::  - External service downtime"
-          echo "::notice::  - Gas price fluctuations"
-          echo "::notice::E2E test failures do NOT block the main CI pipeline"
-
       # There is a small bug in docker compose that will cause 401 if we don't pull the base image manually
       #
       # See more here https://github.com/docker/compose-cli/issues/1545
@@ -217,34 +207,74 @@ jobs:
         with:
           path: ./logs
 
-      # Post comment on E2E test failure
-      - name: Comment on E2E failure
-        if: steps.test-e2e.outcome == 'failure'
+      # Post comment on E2E test completion (success or failure)
+      - name: Comment on E2E results
+        if: always() && steps.test-e2e.outcome != 'skipped' && steps.test-e2e.outcome != 'cancelled'
         uses: actions/github-script@v7
         with:
           script: |
+            const outcome = '${{ steps.test-e2e.outcome }}';
+            const emoji = outcome === 'success' ? '✅' : '❌';
+            const status = outcome === 'success' ? 'Passed' : 'Failed';
+            const timestamp = new Date().toISOString().replace('T', ' ').substring(0, 16) + ' (UTC)';
+            const runNumber = context.runNumber;
             const runUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
             const prNumber = context.payload.pull_request?.number;
+            const header = "## 🧪 E2E Test Status";
+            
+            const newEntry = `- ${emoji} [Run #${runNumber}](${runUrl}) - ${status} - ${timestamp}`;
 
             if (prNumber) {
-              const comment = "## 🚨 E2E Tests Failed\n\n" +
-                "The E2E tests failed during CI. These tests validate real blockchain interactions and may fail due to:\n" +
-                "- Network connectivity issues\n" +
-                "- RPC rate limiting\n" +
-                "- External service downtime\n" +
-                "**Action Run:** " + runUrl + "\n\n" +
-                "This is **non-blocking** and does not prevent merging. Check the action logs above for detailed failure information.";
-
               try {
-                await github.rest.issues.createComment({
-                  issue_number: prNumber,
+                const { data: comments } = await github.rest.issues.listComments({
                   owner: context.repo.owner,
                   repo: context.repo.repo,
-                  body: comment
+                  issue_number: prNumber,
                 });
+
+                const botComment = comments.find(comment => 
+                  comment.user.type === 'Bot' && 
+                  comment.body.includes(header)
+                );
+
+                if (botComment) {
+                  // Extract existing entries
+                  const bodyLines = botComment.body.split('\n');
+                  const runsStartIndex = bodyLines.findIndex(line => line.trim() === '**Test Runs (Newest First):**');
+                  
+                  let newBody;
+                  if (runsStartIndex !== -1) {
+                    // Prepend new entry to existing runs (newest first)
+                    const beforeRuns = bodyLines.slice(0, runsStartIndex + 1).join('\n');
+                    const existingRuns = bodyLines.slice(runsStartIndex + 1).join('\n');
+                    newBody = beforeRuns + '\n' + newEntry + '\n' + existingRuns;
+                  } else {
+                    // Shouldn't happen, but handle gracefully
+                    newBody = botComment.body + '\n\n**Test Runs (Newest First):**\n' + newEntry;
+                  }
+
+                  await github.rest.issues.updateComment({
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    comment_id: botComment.id,
+                    body: newBody
+                  });
+                } else {
+                  // Create new comment
+                  const comment = header + "\n\n" +
+                    "E2E tests are non-blocking and validate real blockchain interactions. Failures may occur due to network issues, RPC rate limits, or external service downtime.\n\n" +
+                    "**Test Runs (Newest First):**\n" +
+                    newEntry;
+
+                  await github.rest.issues.createComment({
+                    issue_number: prNumber,
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    body: comment
+                  });
+                }
               } catch (error) {
-                // Silently fail if we don't have permission to comment (e.g., on forks)
-                console.log('Could not post comment to PR:', error.message);
+                console.log('Error managing PR comments:', error.message);
               }
             }
 

examples/oapp-solana/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @layerzerolabs/oapp-solana-example
 
+## 0.2.0
+
+### Minor Changes
+
+- 6c95cd3: migrate oapp-solana to LzReceiveTypesV2
+
 ## 0.1.5
 
 ### Patch Changes

examples/oapp-solana/README.md

@@ -299,6 +299,26 @@ npx hardhat --network arbitrum-sepolia lz:oapp:send --from-eid 40231 --dst-eid 4
 
 Congratulations, you have now successfully set up an EVM <> Solana OApp.
 
+### Viewing Sent Strings
+
+After sending cross-chain messages you can inspect the stored string on either side directly from the terminal:
+
+- Solana store account:
+
+  ```bash
+  npx hardhat lz:oapp:solana:debug --eid 40168 --action store
+  ```
+
+  Use the Solana endpoint ID that matches your environment (e.g., `40168` for Devnet, `30168` for Mainnet) and optionally pass `--store <STORE_PUBKEY>` if you need to override the derived PDA.
+
+- EVM contract storage:
+
+  ```bash
+  npx hardhat lz:oapp:evm:debug --network arbitrum-sepolia --contract-name MyOApp
+  ```
+
+  Switch `--network` to the EVM chain you deployed to and supply a different `--contract-name` if your deployment artifact uses another name. The task performs a read-only call to the `data()` getter and prints the latest received message.
+
 ### Running tests
 
 The `test` command will execute the hardhat and forge tests:

examples/oapp-solana/layerzero.config.ts

@@ -38,14 +38,14 @@ const SOLANA_ENFORCED_OPTIONS: OAppEnforcedOption[] = [
 // Arbitrum <-> Solana
 
 // With the config generator, pathways declared are automatically bidirectional
-// i.e. if you declare A,B there's no need to declare B,A
+// i.e. if you declare Arbitrum,Solana there's no need to declare Solana,Arbitrum
 const pathways: TwoWayConfig[] = [
     [
-        arbitrumContract, // Chain A contract
-        solanaContract, // Chain B contract
+        arbitrumContract, // Arbitrum contract
+        solanaContract, // Solana contract
         [['LayerZero Labs'], []], // [ requiredDVN[], [ optionalDVN[], threshold ] ]
-        [1, 32], // [A to B confirmations, B to A confirmations]
-        [SOLANA_ENFORCED_OPTIONS, EVM_ENFORCED_OPTIONS], // Chain B enforcedOptions, Chain A enforcedOptions
+        [20, 32], // [Arbitrum to Solana outbound confirmations, Solana to Arbitrum outbound confirmations]
+        [SOLANA_ENFORCED_OPTIONS, EVM_ENFORCED_OPTIONS], // Arbitrum to Solana enforcedOptions, Solana to Arbitrum enforcedOptions
     ],
 ]
 

examples/oapp-solana/lib/client/generated/my_oapp/accounts/endpointSettings.ts

@@ -64,10 +64,7 @@ export function getEndpointSettingsAccountDataSerializer(): Serializer<
             ],
             { description: 'EndpointSettingsAccountData' }
         ),
-        (value) => ({
-            ...value,
-            discriminator: new Uint8Array([221, 232, 73, 56, 10, 66, 72, 14]),
-        })
+        (value) => ({ ...value, discriminator: new Uint8Array([221, 232, 73, 56, 10, 66, 72, 14]) })
     ) as Serializer<EndpointSettingsAccountDataArgs, EndpointSettingsAccountData>
 }
 
@@ -124,7 +121,7 @@ export async function safeFetchAllEndpointSettings(
 }
 
 export function getEndpointSettingsGpaBuilder(context: Pick<Context, 'rpc' | 'programs'>) {
-    const programId = context.programs.getPublicKey('myOapp', 'HFyiETGKEUS9tr87K1HXmVJHkqQRtw8wShRNTMkKKxay')
+    const programId = context.programs.getPublicKey('myOapp', '')
     return gpaBuilder(context, programId)
         .registerFields<{
             discriminator: Uint8Array

examples/oapp-solana/lib/client/generated/my_oapp/accounts/lzReceiveTypesAccounts.ts

@@ -25,17 +25,19 @@ import {
     mapSerializer,
     publicKey as publicKeySerializer,
     struct,
+    u8,
 } from '@metaplex-foundation/umi/serializers'
 
-/** LzReceiveTypesAccounts includes accounts that are used in the LzReceiveTypes instruction. */
 export type LzReceiveTypesAccounts = Account<LzReceiveTypesAccountsAccountData>
 
 export type LzReceiveTypesAccountsAccountData = {
     discriminator: Uint8Array
     store: PublicKey
+    alt: PublicKey
+    bump: number
 }
 
-export type LzReceiveTypesAccountsAccountDataArgs = { store: PublicKey }
+export type LzReceiveTypesAccountsAccountDataArgs = { store: PublicKey; alt: PublicKey; bump: number }
 
 export function getLzReceiveTypesAccountsAccountDataSerializer(): Serializer<
     LzReceiveTypesAccountsAccountDataArgs,
@@ -46,13 +48,12 @@ export function getLzReceiveTypesAccountsAccountDataSerializer(): Serializer<
             [
                 ['discriminator', bytes({ size: 8 })],
                 ['store', publicKeySerializer()],
+                ['alt', publicKeySerializer()],
+                ['bump', u8()],
             ],
             { description: 'LzReceiveTypesAccountsAccountData' }
         ),
-        (value) => ({
-            ...value,
-            discriminator: new Uint8Array([248, 87, 167, 117, 5, 251, 21, 126]),
-        })
+        (value) => ({ ...value, discriminator: new Uint8Array([248, 87, 167, 117, 5, 251, 21, 126]) })
     ) as Serializer<LzReceiveTypesAccountsAccountDataArgs, LzReceiveTypesAccountsAccountData>
 }
 
@@ -109,16 +110,18 @@ export async function safeFetchAllLzReceiveTypesAccounts(
 }
 
 export function getLzReceiveTypesAccountsGpaBuilder(context: Pick<Context, 'rpc' | 'programs'>) {
-    const programId = context.programs.getPublicKey('myOapp', 'HFyiETGKEUS9tr87K1HXmVJHkqQRtw8wShRNTMkKKxay')
+    const programId = context.programs.getPublicKey('myOapp', '')
     return gpaBuilder(context, programId)
-        .registerFields<{ discriminator: Uint8Array; store: PublicKey }>({
+        .registerFields<{ discriminator: Uint8Array; store: PublicKey; alt: PublicKey; bump: number }>({
             discriminator: [0, bytes({ size: 8 })],
             store: [8, publicKeySerializer()],
+            alt: [40, publicKeySerializer()],
+            bump: [72, u8()],
         })
         .deserializeUsing<LzReceiveTypesAccounts>((account) => deserializeLzReceiveTypesAccounts(account))
         .whereField('discriminator', new Uint8Array([248, 87, 167, 117, 5, 251, 21, 126]))
 }
 
 export function getLzReceiveTypesAccountsSize(): number {
-    return 40
+    return 73
 }

examples/oapp-solana/lib/client/generated/my_oapp/accounts/peerConfig.ts

@@ -31,11 +31,7 @@ export type PeerConfigAccountData = {
     bump: number
 }
 
-export type PeerConfigAccountDataArgs = {
-    peerAddress: Uint8Array
-    enforcedOptions: EnforcedOptionsArgs
-    bump: number
-}
+export type PeerConfigAccountDataArgs = { peerAddress: Uint8Array; enforcedOptions: EnforcedOptionsArgs; bump: number }
 
 export function getPeerConfigAccountDataSerializer(): Serializer<PeerConfigAccountDataArgs, PeerConfigAccountData> {
     return mapSerializer<PeerConfigAccountDataArgs, any, PeerConfigAccountData>(
@@ -48,10 +44,7 @@ export function getPeerConfigAccountDataSerializer(): Serializer<PeerConfigAccou
             ],
             { description: 'PeerConfigAccountData' }
         ),
-        (value) => ({
-            ...value,
-            discriminator: new Uint8Array([181, 157, 86, 198, 33, 193, 94, 203]),
-        })
+        (value) => ({ ...value, discriminator: new Uint8Array([181, 157, 86, 198, 33, 193, 94, 203]) })
     ) as Serializer<PeerConfigAccountDataArgs, PeerConfigAccountData>
 }
 
@@ -108,7 +101,7 @@ export async function safeFetchAllPeerConfig(
 }
 
 export function getPeerConfigGpaBuilder(context: Pick<Context, 'rpc' | 'programs'>) {
-    const programId = context.programs.getPublicKey('myOapp', 'HFyiETGKEUS9tr87K1HXmVJHkqQRtw8wShRNTMkKKxay')
+    const programId = context.programs.getPublicKey('myOapp', '')
     return gpaBuilder(context, programId)
         .registerFields<{
             discriminator: Uint8Array

examples/oapp-solana/lib/client/generated/my_oapp/accounts/store.ts

@@ -39,12 +39,7 @@ export type StoreAccountData = {
     string: string
 }
 
-export type StoreAccountDataArgs = {
-    admin: PublicKey
-    bump: number
-    endpointProgram: PublicKey
-    string: string
-}
+export type StoreAccountDataArgs = { admin: PublicKey; bump: number; endpointProgram: PublicKey; string: string }
 
 export function getStoreAccountDataSerializer(): Serializer<StoreAccountDataArgs, StoreAccountData> {
     return mapSerializer<StoreAccountDataArgs, any, StoreAccountData>(
@@ -58,10 +53,7 @@ export function getStoreAccountDataSerializer(): Serializer<StoreAccountDataArgs
             ],
             { description: 'StoreAccountData' }
         ),
-        (value) => ({
-            ...value,
-            discriminator: new Uint8Array([130, 48, 247, 244, 182, 191, 30, 26]),
-        })
+        (value) => ({ ...value, discriminator: new Uint8Array([130, 48, 247, 244, 182, 191, 30, 26]) })
     ) as Serializer<StoreAccountDataArgs, StoreAccountData>
 }
 
@@ -118,7 +110,7 @@ export async function safeFetchAllStore(
 }
 
 export function getStoreGpaBuilder(context: Pick<Context, 'rpc' | 'programs'>) {
-    const programId = context.programs.getPublicKey('myOapp', 'HFyiETGKEUS9tr87K1HXmVJHkqQRtw8wShRNTMkKKxay')
+    const programId = context.programs.getPublicKey('myOapp', '')
     return gpaBuilder(context, programId)
         .registerFields<{
             discriminator: Uint8Array