From c0d90968abe6bde0e453f317045d903c902f0487 Mon Sep 17 00:00:00 2001 From: nazreen <10964594+nazreen@users.noreply.github.com> Date: Wed, 14 Jan 2026 12:15:26 -0800 Subject: [PATCH 1/5] remove need for feature flag for oft-solana --- examples/oft-solana/README.md | 2 +- packages/create-lz-oapp/src/config.ts | 19 +++++++------------ packages/create-lz-oapp/test/config.test.ts | 10 +--------- tests-user/tests/create-lz-oapp.bats | 2 +- turbo.json | 1 - 5 files changed, 10 insertions(+), 24 deletions(-) diff --git a/examples/oft-solana/README.md b/examples/oft-solana/README.md index b773a558cd..ee250f32c1 100644 --- a/examples/oft-solana/README.md +++ b/examples/oft-solana/README.md @@ -57,7 +57,7 @@ Create your local copy of this example: ```bash -LZ_ENABLE_SOLANA_OFT_EXAMPLE=1 pnpm dlx create-lz-oapp@latest +pnpm dlx create-lz-oapp@latest ``` Specify the directory, select `OFT (Solana)` and proceed with the installation. diff --git a/packages/create-lz-oapp/src/config.ts b/packages/create-lz-oapp/src/config.ts index 72ff9ca197..f2607608c8 100644 --- a/packages/create-lz-oapp/src/config.ts +++ b/packages/create-lz-oapp/src/config.ts @@ -149,18 +149,13 @@ export const getExamples = (): Example[] => { }, ] : []), - // The Solana OFT example is feature flagged for the time being - ...(process.env.LZ_ENABLE_SOLANA_OFT_EXAMPLE - ? [ - { - id: 'oft-solana', - label: 'OFT (Solana)', - repository, - directory: 'examples/oft-solana', - ref, - }, - ] - : []), + { + id: 'oft-solana', + label: 'OFT (Solana)', + repository, + directory: 'examples/oft-solana', + ref, + }, ...(process.env.LZ_ENABLE_SOLANA_OAPP_EXAMPLE ? [ { diff --git a/packages/create-lz-oapp/test/config.test.ts b/packages/create-lz-oapp/test/config.test.ts index 74fc36c612..2e94bd7bb1 100644 --- a/packages/create-lz-oapp/test/config.test.ts +++ b/packages/create-lz-oapp/test/config.test.ts @@ -40,15 +40,7 @@ describe('config', () => { examples.forEach((example) => expect(example).toMatchObject({ ref: 'ohhello' })) }) - it('should not include Solana OFT example if LZ_ENABLE_SOLANA_OFT_EXAMPLE is empty', () => { - process.env.LZ_ENABLE_SOLANA_OFT_EXAMPLE = '' - - expect(getExamples()).not.toContainEqual(expect.objectContaining({ id: 'oft-solana' })) - }) - - it('should include Solana OFT example if LZ_ENABLE_SOLANA_OFT_EXAMPLE is defined', () => { - process.env.LZ_ENABLE_SOLANA_OFT_EXAMPLE = 'yes' - + it('should include Solana OFT example', () => { expect(getExamples()).toContainEqual(expect.objectContaining({ id: 'oft-solana' })) }) diff --git a/tests-user/tests/create-lz-oapp.bats b/tests-user/tests/create-lz-oapp.bats index 74710a59d3..683a239207 100644 --- a/tests-user/tests/create-lz-oapp.bats +++ b/tests-user/tests/create-lz-oapp.bats @@ -194,7 +194,7 @@ teardown() { @test "should work with pnpm & oft solana example in CI mode" { local DESTINATION="$PROJECTS_DIRECTORY/pnpm-oft-solana" - LZ_ENABLE_SOLANA_OFT_EXAMPLE=1 npx --yes create-lz-oapp --ci --example oft-solana --destination $DESTINATION --package-manager pnpm + npx --yes create-lz-oapp --ci --example oft-solana --destination $DESTINATION --package-manager pnpm cd "$DESTINATION" pnpm compile pnpm test diff --git a/turbo.json b/turbo.json index 420acc6970..92e5cc9082 100644 --- a/turbo.json +++ b/turbo.json @@ -56,7 +56,6 @@ "LZ_ENABLE_EXPERIMENTAL_PARALLEL_EXECUTION", "LZ_ENABLE_EXPERIMENTAL_RETRY", "LZ_ENABLE_EXPERIMENTAL_SIMULATION", - "LZ_ENABLE_SOLANA_OFT_EXAMPLE", "LZ_ENABLE_SOLANA_OAPP_EXAMPLE", "LZ_ENABLE_READ_EXAMPLE", "LZ_ENABLE_ZKSOLC_EXAMPLE", From b479a7c6e87e958db04d95934d82c4691fb60b79 Mon Sep 17 00:00:00 2001 From: nazreen <10964594+nazreen@users.noreply.github.com> Date: Wed, 14 Jan 2026 12:16:11 -0800 Subject: [PATCH 2/5] update labels --- packages/create-lz-oapp/src/config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create-lz-oapp/src/config.ts b/packages/create-lz-oapp/src/config.ts index f2607608c8..264393f262 100644 --- a/packages/create-lz-oapp/src/config.ts +++ b/packages/create-lz-oapp/src/config.ts @@ -27,7 +27,7 @@ export const getExamples = (): Example[] => { }, { id: 'oft', - label: 'OFT', + label: 'OFT - EVM only', repository, directory: 'examples/oft', ref, @@ -151,7 +151,7 @@ export const getExamples = (): Example[] => { : []), { id: 'oft-solana', - label: 'OFT (Solana)', + label: 'OFT - EVM, Solana', repository, directory: 'examples/oft-solana', ref, From 03f7c0fe05fc4fed4970c619b5137993509f86c0 Mon Sep 17 00:00:00 2001 From: nazreen <10964594+nazreen@users.noreply.github.com> Date: Wed, 14 Jan 2026 12:24:17 -0800 Subject: [PATCH 3/5] reorder --- packages/create-lz-oapp/src/config.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/create-lz-oapp/src/config.ts b/packages/create-lz-oapp/src/config.ts index 264393f262..2f95b64311 100644 --- a/packages/create-lz-oapp/src/config.ts +++ b/packages/create-lz-oapp/src/config.ts @@ -25,6 +25,13 @@ export const getExamples = (): Example[] => { directory: 'examples/oapp', ref, }, + { + id: 'oft-solana', + label: 'OFT - EVM, Solana', + repository, + directory: 'examples/oft-solana', + ref, + }, { id: 'oft', label: 'OFT - EVM only', @@ -149,13 +156,6 @@ export const getExamples = (): Example[] => { }, ] : []), - { - id: 'oft-solana', - label: 'OFT - EVM, Solana', - repository, - directory: 'examples/oft-solana', - ref, - }, ...(process.env.LZ_ENABLE_SOLANA_OAPP_EXAMPLE ? [ { From 59d95f46659ba1e2bd807cc4b7e41455c0548a16 Mon Sep 17 00:00:00 2001 From: nazreen <10964594+nazreen@users.noreply.github.com> Date: Fri, 16 Jan 2026 12:45:28 -0800 Subject: [PATCH 4/5] changeset --- .changeset/shiny-crabs-grin.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/shiny-crabs-grin.md diff --git a/.changeset/shiny-crabs-grin.md b/.changeset/shiny-crabs-grin.md new file mode 100644 index 0000000000..262974290b --- /dev/null +++ b/.changeset/shiny-crabs-grin.md @@ -0,0 +1,5 @@ +--- +"create-lz-oapp": patch +--- + +when printing Solana txn data, display in base58 From 587752e87a153dac3ce6ff5b4b99d92fc685ff0e Mon Sep 17 00:00:00 2001 From: nazreen <10964594+nazreen@users.noreply.github.com> Date: Fri, 16 Jan 2026 12:46:31 -0800 Subject: [PATCH 5/5] fix --- .changeset/shiny-crabs-grin.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/shiny-crabs-grin.md b/.changeset/shiny-crabs-grin.md index 262974290b..04e5328e3c 100644 --- a/.changeset/shiny-crabs-grin.md +++ b/.changeset/shiny-crabs-grin.md @@ -2,4 +2,4 @@ "create-lz-oapp": patch --- -when printing Solana txn data, display in base58 +relabel example labels for OFT and OFT (Solana)