Skip to content

Commit 43bb567

Browse files
committed
Merge branch 'main' into test/LW-12806_prometheus_script
2 parents 3a19c68 + c5b2d7f commit 43bb567

File tree

221 files changed

+2912
-3114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+2912
-3114
lines changed

.github/actions/build/app/action.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ inputs:
6767
required: false
6868
default: ''
6969
BROWSER_TARGET:
70-
description: 'Browser target to build for. Options are [firefox | chromium]'
70+
description: 'Browser target to build for. Options are [chromium | firefox]'
7171
required: false
7272
default: 'chromium'
7373

@@ -103,14 +103,27 @@ runs:
103103
SENTRY_ENVIRONMENT: ${{ inputs.SENTRY_ENVIRONMENT }}
104104
BROWSER: ${{ inputs.BROWSER_TARGET }}
105105

106-
- name: Upload artifact
107-
if: ${{ inputs.BROWSER_TARGET != 'firefox' }}
106+
- name: Upload Chrome artifact
107+
if: ${{ inputs.BROWSER_TARGET == 'chromium' }}
108108
uses: actions/upload-artifact@v4
109109
with:
110-
name: ${{ inputs.NAME }}
110+
name: lace-chrome-browser-extension
111+
path: ${{ inputs.DIR }}/dist
112+
113+
- name: Prepare MS Edge
114+
if: ${{ inputs.BROWSER_TARGET == 'chromium' }}
115+
run: 'sed -i "s/\"key\": \"[^\"]*\",//" manifest.json'
116+
shell: bash
117+
working-directory: ${{ inputs.DIR }}/dist
118+
119+
- name: Upload MS Edge artifact
120+
if: ${{ inputs.BROWSER_TARGET == 'chromium' }}
121+
uses: actions/upload-artifact@v4
122+
with:
123+
name: lace-edge-browser-extension
111124
path: ${{ inputs.DIR }}/dist
112125

113-
- name: Pack Firefox
126+
- name: Prepare Firefox
114127
if: ${{ inputs.BROWSER_TARGET == 'firefox' }}
115128
run: yarn pack:firefox
116129
shell: bash

.github/settings.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,10 @@ branches:
8787
strict: false
8888
# Required. The list of status checks to require in order to merge into this branch
8989
checks:
90-
- context: block-fixup
90+
- context: Block fixup commits
9191
- context: Prepare
9292
- context: Unit tests
9393
- context: Process smoke e2e test reports
94-
- context: >
95-
Run Chromatic check: Core
96-
- context: >
97-
Run Chromatic check: Staking
9894
# Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
9995
enforce_admins:
10096
# Prevent merge commits from being pushed to matching branches

.github/shared/build/action.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,35 +44,35 @@ inputs:
4444
CARDANO_SERVICES_URL_MAINNET:
4545
description: 'Url for mainnet env'
4646
required: false
47-
default: 'https://dev-mainnet.lw.iog.io'
47+
default: 'https://live-mainnet.lw.iog.io'
4848
CARDANO_SERVICES_URL_PREPROD:
4949
description: 'Url for preprod env'
5050
required: false
51-
default: 'https://dev-preprod.lw.iog.io'
51+
default: 'https://live-preprod.lw.iog.io'
5252
CARDANO_SERVICES_URL_PREVIEW:
5353
description: 'Url for preview env'
5454
required: false
55-
default: 'https://dev-preview.lw.iog.io'
55+
default: 'https://live-preview.lw.iog.io'
5656
CARDANO_SERVICES_URL_SANCHONET:
5757
description: 'Url for sanchonet env'
5858
required: false
59-
default: 'https://dev-sanchonet.lw.iog.io'
59+
default: 'https://live-sanchonet.lw.iog.io'
6060
CARDANO_WS_SERVER_URL_MAINNET:
6161
description: 'WS url for mainnet env'
6262
required: false
63-
default: 'wss://dev-mainnet.lw.iog.io'
63+
default: 'wss://live-mainnet.lw.iog.io'
6464
CARDANO_WS_SERVER_URL_PREPROD:
6565
description: 'WS url for preprod env'
6666
required: false
67-
default: 'wss://dev-preprod.lw.iog.io'
67+
default: 'wss://live-preprod.lw.iog.io'
6868
CARDANO_WS_SERVER_URL_PREVIEW:
6969
description: 'WS url for preview env'
7070
required: false
71-
default: 'wss://dev-preview.lw.iog.io'
71+
default: 'wss://live-preview.lw.iog.io'
7272
CARDANO_WS_SERVER_URL_SANCHONET:
7373
description: 'WS url for sanchonet env'
7474
required: false
75-
default: 'wss://dev-sanchonet.lw.iog.io'
75+
default: 'wss://live-sanchonet.lw.iog.io'
7676
SENTRY_AUTH_TOKEN:
7777
description: 'Authentication token for Sentry, used to publish source maps for releases'
7878
required: false
@@ -106,6 +106,10 @@ inputs:
106106
description: 'Force Trezor emulation'
107107
required: false
108108
default: 'false'
109+
HANDLE_RESOLUTION_CACHE_LIFETIME:
110+
description: ' ADA handle cache lifetime'
111+
required: false
112+
default: 600000
109113
runs:
110114
using: 'composite'
111115
steps:
@@ -180,4 +184,5 @@ runs:
180184
WALLET_POLLING_INTERVAL_IN_SEC: ${{ inputs.WALLET_POLLING_INTERVAL_IN_SEC }}
181185
BROWSER: ${{ inputs.BROWSER_TARGET }}
182186
E2E_FORCE_TREZOR_PICKED: ${{ inputs.E2E_FORCE_TREZOR_PICKED }}
187+
HANDLE_RESOLUTION_CACHE_LIFETIME: ${{ inputs.HANDLE_RESOLUTION_CACHE_LIFETIME }}
183188
run: yarn browser build

.github/workflows/ci.yml

Lines changed: 160 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
1818

1919
env:
20-
BUILD_ARTIFACT_NAME: 'lace-dev-${{ github.sha }}'
20+
BUILD_ARTIFACT_NAME: 'lace-chrome-browser-extension-for-smoke-tests-${{ github.sha }}'
2121

2222
jobs:
2323
prepare:
@@ -148,8 +148,8 @@ jobs:
148148
- name: Execute unit tests
149149
uses: ./.github/actions/test/unit
150150

151-
release-pkg:
152-
name: Release package
151+
release-chromium-pkg:
152+
name: Release Chromium package
153153
runs-on: ubuntu-22.04
154154
needs: prepare
155155

@@ -210,7 +210,7 @@ jobs:
210210
with:
211211
comment_on_pr: false
212212

213-
- name: Build Lace browser extension
213+
- name: Build Lace Chromium browser extension
214214
uses: ./.github/actions/build/app
215215
with:
216216
BLOCKFROST_PROJECT_ID_MAINNET: ${{ secrets.BLOCKFROST_PROJECT_ID_MAINNET }}
@@ -219,7 +219,7 @@ jobs:
219219
MAESTRO_PROJECT_ID_MAINNET: ${{ secrets.MAESTRO_PROJECT_ID_MAINNET }}
220220
MAESTRO_PROJECT_ID_TESTNET: ${{ secrets.MAESTRO_PROJECT_ID_TESTNET }}
221221
DIR: apps/browser-extension-wallet
222-
NAME: lace-browser-extension
222+
NAME: lace-chrome-browser-extension
223223
LACE_EXTENSION_KEY: ${{ secrets.MANIFEST_PUBLIC_KEY }}
224224
POSTHOG_PRODUCTION_TOKEN: ${{ startsWith(github.ref, 'refs/heads/release') && secrets.POSTHOG_PRODUCTION_TOKEN || '' }}
225225
PRODUCTION_MODE_TRACKING: ${{ startsWith(github.ref, 'refs/heads/release') && 'true' || 'false' }}
@@ -231,7 +231,69 @@ jobs:
231231
SENTRY_ENVIRONMENT: 'production'
232232
DAPP_RADAR_API_KEY: ${{ startsWith(github.ref, 'refs/heads/release') && secrets.DAPP_RADAR_API_KEY || '' }}
233233

234-
- name: Build Lace Firefox addon
234+
release-firefox-pkg:
235+
name: Release Firefox package
236+
runs-on: ubuntu-22.04
237+
needs: prepare
238+
239+
steps:
240+
- name: Checkout repository
241+
uses: actions/checkout@v4
242+
243+
- name: Setup Node.js and install dependencies
244+
uses: ./.github/actions/install
245+
with:
246+
WALLET_PASSWORD: ${{ secrets.WALLET_PASSWORD_TESTNET }}
247+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
248+
249+
- name: Download packages-common
250+
uses: actions/download-artifact@v4
251+
with:
252+
name: packages-common
253+
path: packages/common/dist
254+
255+
- name: Download packages-cardano
256+
uses: actions/download-artifact@v4
257+
with:
258+
name: packages-cardano
259+
path: packages/cardano/dist
260+
261+
- name: Download packages-translation
262+
uses: actions/download-artifact@v4
263+
with:
264+
name: packages-translation
265+
path: packages/translation/dist
266+
267+
- name: Download packages-core
268+
uses: actions/download-artifact@v4
269+
with:
270+
name: packages-core
271+
path: packages/core/dist
272+
273+
- name: Download packages-staking
274+
uses: actions/download-artifact@v4
275+
with:
276+
name: packages-staking
277+
path: packages/staking/dist
278+
279+
- name: Download packages-nami
280+
uses: actions/download-artifact@v4
281+
with:
282+
name: packages-nami
283+
path: packages/nami/dist
284+
285+
- name: Download packages-bitcoin
286+
uses: actions/download-artifact@v4
287+
with:
288+
name: packages-bitcoin
289+
path: packages/bitcoin/dist
290+
291+
- name: Collect Workflow Telemetry Smoke Tests
292+
uses: catchpoint/workflow-telemetry-action@v2
293+
with:
294+
comment_on_pr: false
295+
296+
- name: Build Lace Firefox browser extension
235297
uses: ./.github/actions/build/app
236298
with:
237299
BROWSER_TARGET: 'firefox'
@@ -241,7 +303,7 @@ jobs:
241303
MAESTRO_PROJECT_ID_MAINNET: ${{ secrets.MAESTRO_PROJECT_ID_MAINNET }}
242304
MAESTRO_PROJECT_ID_TESTNET: ${{ secrets.MAESTRO_PROJECT_ID_TESTNET }}
243305
DIR: apps/browser-extension-wallet
244-
NAME: lace-firefox-addon
306+
NAME: lace-firefox-browser-extension
245307
LACE_EXTENSION_KEY: ${{ secrets.MANIFEST_PUBLIC_KEY }}
246308
POSTHOG_PRODUCTION_TOKEN: ${{ startsWith(github.ref, 'refs/heads/release') && secrets.POSTHOG_PRODUCTION_TOKEN || '' }}
247309
PRODUCTION_MODE_TRACKING: ${{ startsWith(github.ref, 'refs/heads/release') && 'true' || 'false' }}
@@ -254,7 +316,7 @@ jobs:
254316
DAPP_RADAR_API_KEY: ${{ startsWith(github.ref, 'refs/heads/release') && secrets.DAPP_RADAR_API_KEY || '' }}
255317

256318
build:
257-
name: Build Lace
319+
name: Build Lace for E2E Tests
258320
runs-on: ubuntu-22.04
259321

260322
steps:
@@ -558,3 +620,93 @@ jobs:
558620
if: ${{ needs.if-staking-changed.outputs.requireChromaticCheck == 0 }}
559621
run: echo "Chromatic check for packages/staking not needed"
560622
exit 0
623+
624+
if-nami-changed:
625+
name: When nami changed
626+
if: ${{ github.event.pull_request.draft == false }}
627+
runs-on: ubuntu-22.04
628+
outputs:
629+
requireChromaticCheck: ${{ steps.diffcheck.outputs.requireChromaticCheck }}
630+
steps:
631+
- name: Checkout repository
632+
uses: actions/checkout@v4
633+
with:
634+
fetch-depth: 0
635+
636+
- id: diffcheck
637+
run: |
638+
set +e
639+
git diff --quiet ${{ github.event.pull_request.base.sha }}..${{ github.sha }} -- packages/nami/**
640+
echo "requireChromaticCheck=$?" >> "$GITHUB_OUTPUT"
641+
cat $GITHUB_OUTPUT
642+
set -e
643+
644+
chromaticNami:
645+
name: >
646+
Run Chromatic check: Nami
647+
runs-on: ubuntu-22.04
648+
needs:
649+
- prepare
650+
- if-nami-changed
651+
652+
steps:
653+
- name: Checkout repository
654+
if: ${{ needs.if-nami-changed.outputs.requireChromaticCheck == 1 }}
655+
uses: actions/checkout@v4
656+
with:
657+
fetch-depth: 0
658+
659+
- name: Setup Node.js and install dependencies
660+
if: ${{ needs.if-nami-changed.outputs.requireChromaticCheck == 1 }}
661+
uses: ./.github/actions/install
662+
with:
663+
WALLET_PASSWORD: ${{ secrets.WALLET_PASSWORD_TESTNET }}
664+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
665+
666+
- name: Download packages-common
667+
if: ${{ needs.if-nami-changed.outputs.requireChromaticCheck == 1 }}
668+
uses: actions/download-artifact@v4
669+
with:
670+
name: packages-common
671+
path: packages/common/dist
672+
673+
- name: Download packages-cardano
674+
if: ${{ needs.if-nami-changed.outputs.requireChromaticCheck == 1 }}
675+
uses: actions/download-artifact@v4
676+
with:
677+
name: packages-cardano
678+
path: packages/cardano/dist
679+
680+
- name: Download packages-translation
681+
if: ${{ needs.if-nami-changed.outputs.requireChromaticCheck == 1 }}
682+
uses: actions/download-artifact@v4
683+
with:
684+
name: packages-translation
685+
path: packages/translation/dist
686+
687+
- name: Download packages-core
688+
if: ${{ needs.if-nami-changed.outputs.requireChromaticCheck == 1 }}
689+
uses: actions/download-artifact@v4
690+
with:
691+
name: packages-core
692+
path: packages/core/dist
693+
694+
- name: Download packages-nami
695+
if: ${{ needs.if-nami-changed.outputs.requireChromaticCheck == 1 }}
696+
uses: actions/download-artifact@v4
697+
with:
698+
name: packages-nami
699+
path: packages/nami/dist
700+
701+
- name: Chromatic packages-nami
702+
if: ${{ needs.if-nami-changed.outputs.requireChromaticCheck == 1 }}
703+
uses: ./.github/actions/chromatic
704+
with:
705+
DIR: packages/nami
706+
NAME: packages-nami
707+
TOKEN: ${{ secrets.CHROMATIC_LACE_NAMI_TOKEN }}
708+
709+
- name: Skip
710+
if: ${{ needs.if-nami-changed.outputs.requireChromaticCheck == 0 }}
711+
run: echo "Chromatic check for packages/nami not needed"
712+
exit 0

.github/workflows/e2e-tests-linux-split.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ jobs:
123123
WALLET_POLLING_INTERVAL_IN_SEC: 5
124124
BROWSER_TARGET: ${{ env.BROWSER }}
125125
E2E_FORCE_TREZOR_PICKED: true
126+
HANDLE_RESOLUTION_CACHE_LIFETIME: 10000
126127

127128
- name: Upload build artifact
128129
if: needs.setup.outputs.build_exists == 'false'

.github/workflows/git-checks.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Git Checks
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened, ready_for_review]
6+
7+
jobs:
8+
block-fixup:
9+
name: Block fixup commits
10+
if: github.event.pull_request.draft == false
11+
runs-on: ubuntu-22.04
12+
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Block Fixup Commit Merge
17+
uses: 13rac1/block-fixup-merge-action@v2.0.0

0 commit comments

Comments
 (0)