Merge branch 'main' into solana-examples/conditional-ata-value

Author: nazreen

.changeset/long-panthers-sit.md

@@ -0,0 +1,5 @@
+---
+"@layerzerolabs/oft-solana-example": patch
+---
+
+update nodejs version

.changeset/small-starfishes-crash.md

@@ -122,6 +122,8 @@ jobs:
           FOUNDRY_PROFILE: "ci"
           RPC_URL_HYPERLIQUID: "http://127.0.0.1:8546"
           RPC_URL_HYPERLIQUID_UPSTREAM: ${{ secrets.RPC_URL_HYPERLIQUID_UPSTREAM || 'https://rpc.hyperliquid.xyz/evm' }}
+          # Exclude e2e tests from regular CI
+          JEST_TEST_PATH_IGNORE_PATTERNS: '["<rootDir>/**/test/e2e/**"]'
 
       # We'll collect the docker compose logs from all containers on failure
       - name: Collect docker logs on failure
@@ -137,23 +139,122 @@ jobs:
         with:
           path: ./logs
 
-  test-user:
-    name: User test
-    runs-on: ${{ matrix.runner }}
+  test-e2e:
+    name: Test E2E (Non-blocking)
+    runs-on: ubuntu-latest-16xlarge
+    if: github.ref != 'refs/heads/main'
 
     permissions:
       contents: read
       packages: read
+      issues: write
+      pull-requests: write
 
-    strategy:
-      matrix:
-        include:
-          - platform: linux/amd64
-            runner: ubuntu-latest-16xlarge
-            arch: amd64
-          - platform: linux/arm64
-            runner: ubuntu-latest-16xlarge-arm
-            arch: arm64
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          submodules: "true"
+
+      - name: Setup environment
+        uses: ./.github/workflows/actions/setup-environment
+
+      - 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
+      - name: Authenticate to GHCR
+        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Test E2E
+        id: test-e2e
+        run: pnpm test:ci:e2e
+        continue-on-error: true
+        env:
+          # Disable parallel execution for now
+          LZ_ENABLE_EXPERIMENTAL_PARALLEL_EXECUTION: false
+          JEST_TIMEOUT: 120_000  # Increase timeout for ARM builds (2 minutes)
+          TEST_TIMEOUT: 1_200_000 # 20 minutes timeout for long-running e2e tests
+          # We'll use the prebuilt base image
+          DEVTOOLS_BASE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-base:main
+          # And the prebuilt hardhat EVM node image
+          DEVTOOLS_EVM_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-evm-hardhat:main
+          # And the prebuilt TON node image
+          DEVTOOLS_TON_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-ton-my-local-ton:main
+          # Enable Solana tests for e2e
+          LZ_DEVTOOLS_ENABLE_SOLANA_TESTS: 1
+          RPC_URL_SOLANA_MAINNET: ${{ secrets.RPC_URL_SOLANA_MAINNET || 'https://rpc.ankr.com/solana' }}
+          RPC_URL_SOLANA_TESTNET: ${{ secrets.RPC_URL_SOLANA_TESTNET || 'https://api.devnet.solana.com' }}
+          FOUNDRY_PROFILE: "ci"
+          RPC_URL_HYPERLIQUID: "http://127.0.0.1:8546"
+          RPC_URL_HYPERLIQUID_UPSTREAM: ${{ secrets.RPC_URL_HYPERLIQUID_UPSTREAM || 'https://rpc.hyperliquid.xyz/evm' }}
+          # Run only e2e tests
+          JEST_TEST_PATH_PATTERN: 'test/e2e'
+
+      # We'll collect the docker compose logs from all containers on failure
+      - name: Collect docker logs on failure
+        if: steps.test-e2e.outcome == 'failure'
+        uses: jwalton/gh-docker-logs@v2
+        with:
+          dest: "./logs"
+
+      # We'll collect the docker compose logs from all containers on failure
+      - name: Store docker logs
+        if: steps.test-e2e.outcome == 'failure'
+        uses: actions/upload-artifact@v4
+        with:
+          path: ./logs
+
+      # Post comment on E2E test failure
+      - name: Comment on E2E failure
+        if: steps.test-e2e.outcome == 'failure'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const runUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
+            const prNumber = context.payload.pull_request?.number;
+
+            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,
+                  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);
+              }
+            }
+
+  test-user:
+    name: User test (Parallel)
+    runs-on: ubuntu-latest-16xlarge
+
+    permissions:
+      contents: read
+      packages: read
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4

.github/workflows/reusable-test.yaml

@@ -10,7 +10,7 @@ permissions:
 jobs:
   verify-example-lockfiles:
     name: Verify example lockfiles
-    if: github.actor != 'layerzero-bot'
+    if: github.event.pull_request.user.login != 'layerzero-bot'
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/verify-lockfiles.yaml

@@ -422,7 +422,7 @@ ENV CARGO_BUILD_JOBS=$CARGO_BUILD_JOBS
 ENV PATH="/root/.foundry/bin:$PATH"
 RUN curl -L https://foundry.paradigm.xyz | bash && \
     foundryup -i ${FOUNDRY_VERSION} && \
-    foundryup -u ${FOUNDRY_VERSION}
+    foundryup -u v${FOUNDRY_VERSION}
 
 # Install SVM and Solidity compiler in single layer
 RUN cargo +${RUST_TOOLCHAIN_VERSION_ANCHOR} install svm-rs@${SVM_RS_VERSION} && \

Dockerfile

@@ -117,7 +117,41 @@ services:
       - RPC_URL_SOLANA_TESTNET=${RPC_URL_SOLANA_TESTNET}
       - LZ_DEVTOOLS_ENABLE_SOLANA_TESTS=${LZ_DEVTOOLS_ENABLE_SOLANA_TESTS}
       - FOUNDRY_PROFILE=${FOUNDRY_PROFILE}
-      - RPC_URL_HYPERLIQUID=${RPC_URL_HYPERLIQUID}
+
+  #
+  # .oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.
+  #                       E2E Tests (Live RPC Tests)
+  # .oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.
+  #
+  tests-e2e:
+    extends:
+      file: docker-compose.templates.yaml
+      service: project
+    depends_on:
+      network-vengaboys:
+        condition: service_healthy
+      network-britney:
+        condition: service_healthy
+      network-tango:
+        condition: service_healthy
+      network-ton:
+        condition: service_healthy
+      network-hyperliquid:
+        condition: service_healthy
+    logging:
+      driver: none
+    # E2E tests run against live networks, no local network URLs needed
+    environment:
+      - DOCKER_COMPOSE_RUN_TESTS_TURBO_ARGS=$DOCKER_COMPOSE_RUN_TESTS_TURBO_ARGS
+      # E2E tests use live RPC URLs
+      - RPC_URL_SOLANA_MAINNET=${RPC_URL_SOLANA_MAINNET}
+      - RPC_URL_SOLANA_TESTNET=${RPC_URL_SOLANA_TESTNET}
+      - LZ_DEVTOOLS_ENABLE_SOLANA_TESTS=${LZ_DEVTOOLS_ENABLE_SOLANA_TESTS}
+      - FOUNDRY_PROFILE=${FOUNDRY_PROFILE}
+      # E2E specific environment variables
+      - PRIVATE_KEY=${PRIVATE_KEY}
+      - NETWORK_URL_TON=http://network-ton:8081/jsonRPC
+      - NETWORK_URL_HYPERLIQUID=http://network-hyperliquid:8546
     volumes:
       - ./node_modules/.cache/turbo:/app/node_modules/.cache/turbo
       # Hardhat has an issue with caching compilers inside a docker container,
@@ -132,5 +166,5 @@ services:
       # This would normally be fine, but if we have more than 1 solana examples anchor tries building them in parallel.
       # Anchor does not respect file locks on the rustup directory, so the builds fail as it can't overwrite the other example's rustup.
       # Running rustup default before pnpm test ensures that the rustup directory is present and up to date.
-    command: "pnpm test"
+    command: "pnpm turbo test:e2e"
 

docker-compose.yaml

@@ -1,5 +1,24 @@
 # @layerzerolabs/lzapp-migration-example
 
+## 0.3.8
+
+### Patch Changes
+
+- d720011: oft-solana: require user to confirm max total token supply given a local decimals value
+- d720011: print max supply given solana local decimals
+- Updated dependencies [d720011]
+  - @layerzerolabs/devtools-solana@3.0.4
+  - @layerzerolabs/devtools@2.0.3
+
+## 0.3.7
+
+### Patch Changes
+
+- ccc14e0: fix default ALTs not used
+- Updated dependencies [06dc63b]
+  - @layerzerolabs/devtools-solana@3.0.3
+  - @layerzerolabs/devtools@2.0.2
+
 ## 0.3.6
 
 ### Patch Changes

examples/lzapp-migration/CHANGELOG.md

@@ -39,6 +39,7 @@ if (accounts == null) {
 const config: HardhatUserConfig = {
     paths: {
         cache: 'cache/hardhat',
+        tests: 'test/hardhat', // prevents test/scripts from being run
     },
     solidity: {
         compilers: [

examples/lzapp-migration/hardhat.config.ts

@@ -0,0 +1,12 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+    reporters: [['github-actions', { silent: false }], 'default'],
+    testEnvironment: 'node',
+    testTimeout: 15000,
+    moduleNameMapper: {
+        '^@/(.*)$': '<rootDir>/src/$1',
+    },
+    transform: {
+        '^.+\\.(t|j)sx?$': '@swc/jest',
+    },
+}

examples/lzapp-migration/jest.config.ts

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/lzapp-migration-example",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -16,16 +16,17 @@
     "test": "$npm_execpath run test:hardhat",
     "test:anchor": "anchor test",
     "test:forge": "forge test",
-    "test:hardhat": "hardhat test"
+    "test:hardhat": "hardhat test",
+    "test:scripts": "jest --config jest.config.ts --runInBand --testMatch \"**/*.script.test.ts\""
   },
   "resolutions": {
     "ethers": "^5.7.2",
     "hardhat-deploy": "^0.12.1"
   },
   "dependencies": {
-    "@layerzerolabs/devtools": "^2.0.0",
+    "@layerzerolabs/devtools": "^2.0.3",
     "@layerzerolabs/devtools-evm-hardhat": "^4.0.0",
-    "@layerzerolabs/devtools-solana": "^3.0.0",
+    "@layerzerolabs/devtools-solana": "^3.0.4",
     "@layerzerolabs/export-deployments": "^0.0.16",
     "@layerzerolabs/io-devtools": "^0.3.0",
     "@layerzerolabs/lz-evm-sdk-v1": "^3.0.49",
@@ -45,13 +46,13 @@
     "@metaplex-foundation/umi-web3js-adapters": "^0.9.2",
     "@solana-developers/helpers": "^2.7.0",
     "@solana/spl-token": "^0.4.12",
-    "@solana/web3.js": "~1.95.8"
+    "@solana/web3.js": "~1.95.8",
+    "jest": "^29.7.0"
   },
   "devDependencies": {
     "@babel/core": "^7.23.9",
     "@coral-xyz/anchor": "^0.31.1",
     "@layerzerolabs/eslint-config-next": "~2.3.39",
-    "@layerzerolabs/io-devtools": "~0.3.0",
     "@layerzerolabs/lz-definitions": "^3.0.75",
     "@layerzerolabs/lz-evm-messagelib-v2": "^3.0.75",
     "@layerzerolabs/lz-evm-protocol-v2": "^3.0.75",