Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
live-github-bot[bot] committed Jun 23, 2023
2 parents 30ded88 + 7961cdd commit 518c336
Show file tree
Hide file tree
Showing 3,362 changed files with 42,142 additions and 61,981 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
31 changes: 31 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
module.exports = {
root: true,
env: {
node: true,
},
parser: "@typescript-eslint/parser",
plugins: ["@typescript-eslint", "prettier", "json"],
extends: [
"eslint:recommended",
"plugin:prettier/recommended",
"plugin:json/recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
],
rules: {
"prettier/prettier": "error",
"no-inner-declarations": "off",
// Enables no-unused-vars only from TypeScript
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": [
"error",
{
argsIgnorePattern: "^_",
destructuredArrayIgnorePattern: "^_",
vars: "all",
args: "after-used",
ignoreRestSiblings: true,
},
],
},
};
5 changes: 5 additions & 0 deletions .github/workflows/build-desktop-external.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ on:
required: true
base_ref:
description: The base branch to merge the head into when checking out the code
required: false
draft:
description: true if the PR is in draft
required: false
default: "false"

concurrency:
# See: https://github.com/orgs/community/discussions/35341
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/build-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ on:
required: true
base_ref:
description: The base branch to merge the head into when checking out the code
required: false
draft:
description: true if the PR is in draft
required: false
default: "false"

concurrency:
# See: https://github.com/orgs/community/discussions/35341
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/build-mobile-external.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
required: true
base_ref:
description: The base branch to merge the head into when checking out the code
required: false

concurrency:
# See: https://github.com/orgs/community/discussions/35341
Expand All @@ -28,7 +29,7 @@ jobs:
- uses: LedgerHQ/ledger-live/tools/actions/composites/checkout-merge@develop
with:
ref: ${{ github.ref_name }}
base_ref: ${{ inputs.base_ref }}
base: ${{ inputs.base_ref }}
- name: set git user
run: |
git config user.email "105061298+live-github-bot[bot]@users.noreply.github.com"
Expand Down Expand Up @@ -97,7 +98,7 @@ jobs:
- uses: LedgerHQ/ledger-live/tools/actions/composites/checkout-merge@develop
with:
ref: ${{ github.ref_name }}
base_ref: ${{ inputs.base_ref }}
base: ${{ inputs.base_ref }}
- name: set git user
run: |
git config user.email "105061298+live-github-bot[bot]@users.noreply.github.com"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
required: true
base_ref:
description: The base branch to merge the head into when checking out the code
required: false

concurrency:
# See: https://github.com/orgs/community/discussions/35341
Expand Down
27 changes: 24 additions & 3 deletions .github/workflows/test-desktop-external.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ on:
required: true
base_ref:
description: The base branch to merge the head into when checking out the code
required: false
draft:
description: true if the PR is in draft
required: false
default: "false"

concurrency:
# See: https://github.com/orgs/community/discussions/35341
Expand Down Expand Up @@ -82,7 +87,12 @@ jobs:
install_playwright: true
- name: Run playwright tests [Linux => xvfb-run]
id: tests
run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- pnpm desktop test:playwright
run: |
if [[ "${{ inputs.draft }}" == true ]]; then
xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- pnpm desktop test:playwright
else
xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- pnpm desktop test:playwright
fi
- name: upload diffs to imgur
if: always() && !cancelled()
uses: ./tools/actions/upload-images
Expand Down Expand Up @@ -140,7 +150,12 @@ jobs:
install_playwright: true
- name: Run playwright tests
id: tests
run: pnpm desktop test:playwright
run: |
if [[ "${{ inputs.draft }}" == true ]]; then
pnpm desktop test:playwright
else
pnpm desktop test:playwright
fi
- name: upload diffs to imgur
if: always() && !cancelled()
uses: ./tools/actions/upload-images
Expand Down Expand Up @@ -198,7 +213,13 @@ jobs:
upgrade_npm: true
- name: Run playwright tests
id: tests
run: pnpm desktop test:playwright
run: |
if [[ "${{ inputs.draft }}" == true ]]; then
pnpm desktop test:playwright
else
pnpm desktop test:playwright
fi
shell: bash
- name: upload diffs to imgur
if: always() && !cancelled()
uses: ./tools/actions/upload-images
Expand Down
27 changes: 24 additions & 3 deletions .github/workflows/test-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ on:
required: true
base_ref:
description: The base branch to merge the head into when checking out the code
required: false
draft:
description: true if the PR is in draft
required: false
default: "false"

concurrency:
# See: https://github.com/orgs/community/discussions/35341
Expand Down Expand Up @@ -109,7 +114,13 @@ jobs:
upgrade_npm: true
- name: Run playwright tests
id: tests
run: pnpm desktop test:playwright
run: |
if [[ "${{ inputs.draft }}" == true ]]; then
pnpm desktop test:playwright
else
pnpm desktop test:playwright
fi
shell: bash
- name: upload diffs to imgur
if: always() && !cancelled()
uses: ./tools/actions/upload-images
Expand Down Expand Up @@ -174,7 +185,12 @@ jobs:
install_playwright: true
- name: Run playwright tests [Linux => xvfb-run]
id: tests
run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- pnpm desktop test:playwright
run: |
if [[ "${{ inputs.draft }}" == true ]]; then
xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- pnpm desktop test:playwright
else
xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- pnpm desktop test:playwright
fi
- name: upload diffs to imgur
if: always() && !cancelled()
uses: ./tools/actions/upload-images
Expand Down Expand Up @@ -239,7 +255,12 @@ jobs:
pnpm_dest: ${{ runner.temp }}/setup-pnpm
- name: Run playwright tests
id: tests
run: pnpm desktop test:playwright
run: |
if [[ "${{ inputs.draft }}" == true ]]; then
pnpm desktop test:playwright
else
pnpm desktop test:playwright
fi
- name: upload diffs to imgur
if: always() && !cancelled()
uses: ./tools/actions/upload-images
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-mobile-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
required: true
base_ref:
description: The base branch to merge the head into when checking out the code
required: false

# Uncomment to have log-level: trace on detox run and build
# (cf: apps/ledger-live-mobile/detox.config.js)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
required: true
base_ref:
description: The base branch to merge the head into when checking out the code
required: false

concurrency:
# See: https://github.com/orgs/community/discussions/35341
Expand Down Expand Up @@ -52,8 +53,7 @@ jobs:
- name: Run linter
run: |
pnpm lint --filter="live-mobile" --api="http://127.0.0.1:${{ steps.turborepo-cache-server.outputs.port }}" --token="yolo" --team="foo" -- --format="json" -o="lint.json"
cd apps/ledger-live-mobile
node -p "require('./node_modules/eslint/lib/cli-engine/formatters/stylish.js')(require('./lint.json'))"
node -p "require('./node_modules/eslint/lib/cli-engine/formatters/stylish.js')(require('./apps/ledger-live-mobile/lint.json'))"
- name: check for dead code
run: cd apps/ledger-live-mobile && npx unimported
shell: bash
Expand Down
23 changes: 22 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,27 @@ jobs:
echo "diff=$diff" >> $GITHUB_OUTPUT
exit $diff
test-common-tools:
name: "Test common-tools"
env:
NODE_OPTIONS: "--max-old-space-size=7168"
FORCE_COLOR: 3
outputs:
fail: ${{ steps.diff.outputs.diff }}
runs-on: ubuntu-latest
steps:
- uses: LedgerHQ/ledger-live/tools/actions/composites/checkout-merge@develop
with:
ref: ${{ github.event_name == 'workflow_dispatch' && github.ref_name || github.sha }}
base: ${{ inputs.since_branch }}
- name: Setup the toolchain
uses: ./tools/actions/composites/setup-toolchain
- name: Install dependencies
run: pnpm i -F "live-common-tools..." -F "ledger-live"
- name: build common-tools
run: pnpm turbo run build --filter="live-common-tools"

test-cli:
name: "Test CLI"
env:
Expand Down Expand Up @@ -154,7 +175,7 @@ jobs:
path: ${{ github.workspace }}/summary-${{ matrix.os }}.txt

report:
needs: [test-cli, test-docs, test-libraries]
needs: [test-cli, test-docs, test-libraries, test-common-tools]
if: always() && !cancelled() && github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
steps:
Expand Down
5 changes: 5 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"printWidth": 100,
"trailingComma": "all",
"arrowParens": "avoid"
}
2 changes: 1 addition & 1 deletion .prototools
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
node = "18"
npm = "9"
pnpm = "8.1"
pnpm = "8.5"
5 changes: 5 additions & 0 deletions apps/cli/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
rules: {
"@typescript-eslint/no-empty-function": "warn",
},
};
67 changes: 67 additions & 0 deletions apps/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,72 @@
# @ledgerhq/live-cli

## 22.9.1

### Patch Changes

- [#3497](https://github.com/LedgerHQ/ledger-live/pull/3497) [`81dd0c3ef3`](https://github.com/LedgerHQ/ledger-live/commit/81dd0c3ef38a3d6d69c27c65864bf1b41c52643c) Thanks [@alexandremgo](https://github.com/alexandremgo)! - feat: new toggleOnboardingEarlyCheckAction device action

Introducing a new device action (implemented in the device SDK): toggleOnboardingEarlyCheckAction with

- its associated new command and task
- its associated new onboarding state
- a hook useToggleOnboardingEarlyCheck for simple usage on LLM and LLD
- unit tests
- its associated cli command deviceSDKToggleOnboardingEarlyCheck

This new action uses a new APDU to enter and exit the "early security check" blocking step during the onboarding of Stax.

- Updated dependencies [[`24483331fe`](https://github.com/LedgerHQ/ledger-live/commit/24483331fe19b9ae4a24544e2f3e1d2ad1892492), [`81dd0c3ef3`](https://github.com/LedgerHQ/ledger-live/commit/81dd0c3ef38a3d6d69c27c65864bf1b41c52643c), [`b93f543a20`](https://github.com/LedgerHQ/ledger-live/commit/b93f543a207f35edbe25f3d609533120c9babbe1), [`3cf4397b60`](https://github.com/LedgerHQ/ledger-live/commit/3cf4397b60a2da5c1ee92cff42e9f979e30ad489), [`8f50c4d927`](https://github.com/LedgerHQ/ledger-live/commit/8f50c4d927f368fd869401b752a51ba7398e59e1), [`9adc1862dd`](https://github.com/LedgerHQ/ledger-live/commit/9adc1862dda605a722d19f3b6895bd324834c914), [`4a1454beb3`](https://github.com/LedgerHQ/ledger-live/commit/4a1454beb3f86405ba2686e07879c12a7d35ad8e), [`db1a6f92e1`](https://github.com/LedgerHQ/ledger-live/commit/db1a6f92e17dcd63b0c9fa6700496f5f4722f1e5), [`66fdfef314`](https://github.com/LedgerHQ/ledger-live/commit/66fdfef314b6dd63cfd74f00c579138b900ee241), [`d1aa522db7`](https://github.com/LedgerHQ/ledger-live/commit/d1aa522db75f7ea850efe412abaa4dc7d37af6b7), [`5bc987cd8f`](https://github.com/LedgerHQ/ledger-live/commit/5bc987cd8f850bb63e4ced62c28218d7c75744e8), [`ebe5b07afe`](https://github.com/LedgerHQ/ledger-live/commit/ebe5b07afec441ea3e2d9103da9e1175972add47), [`42d8be7694`](https://github.com/LedgerHQ/ledger-live/commit/42d8be76949e258d6360a1fda3ca5a1df50c8bcb), [`ac205cce9f`](https://github.com/LedgerHQ/ledger-live/commit/ac205cce9f328165369c5c270681be1d7ba7d0f2)]:
- @ledgerhq/live-common@31.1.0
- @ledgerhq/errors@6.12.7
- @ledgerhq/cryptoassets@9.8.0
- @ledgerhq/coin-framework@0.3.6
- @ledgerhq/hw-transport@6.28.5
- @ledgerhq/hw-transport-http@6.27.16
- @ledgerhq/hw-transport-node-ble@6.27.16
- @ledgerhq/hw-transport-node-hid@6.27.16
- @ledgerhq/hw-transport-node-speculos@6.27.16
- @ledgerhq/live-network@1.1.1
- @ledgerhq/hw-app-btc@10.0.5
- @ledgerhq/hw-transport-mocker@6.27.16

## 22.9.1-next.1

### Patch Changes

- Updated dependencies []:
- @ledgerhq/live-common@31.1.0-next.1

## 22.9.1-next.0

### Patch Changes

- [#3497](https://github.com/LedgerHQ/ledger-live/pull/3497) [`81dd0c3ef3`](https://github.com/LedgerHQ/ledger-live/commit/81dd0c3ef38a3d6d69c27c65864bf1b41c52643c) Thanks [@alexandremgo](https://github.com/alexandremgo)! - feat: new toggleOnboardingEarlyCheckAction device action

Introducing a new device action (implemented in the device SDK): toggleOnboardingEarlyCheckAction with

- its associated new command and task
- its associated new onboarding state
- a hook useToggleOnboardingEarlyCheck for simple usage on LLM and LLD
- unit tests
- its associated cli command deviceSDKToggleOnboardingEarlyCheck

This new action uses a new APDU to enter and exit the "early security check" blocking step during the onboarding of Stax.

- Updated dependencies [[`24483331fe`](https://github.com/LedgerHQ/ledger-live/commit/24483331fe19b9ae4a24544e2f3e1d2ad1892492), [`81dd0c3ef3`](https://github.com/LedgerHQ/ledger-live/commit/81dd0c3ef38a3d6d69c27c65864bf1b41c52643c), [`b93f543a20`](https://github.com/LedgerHQ/ledger-live/commit/b93f543a207f35edbe25f3d609533120c9babbe1), [`3cf4397b60`](https://github.com/LedgerHQ/ledger-live/commit/3cf4397b60a2da5c1ee92cff42e9f979e30ad489), [`8f50c4d927`](https://github.com/LedgerHQ/ledger-live/commit/8f50c4d927f368fd869401b752a51ba7398e59e1), [`9adc1862dd`](https://github.com/LedgerHQ/ledger-live/commit/9adc1862dda605a722d19f3b6895bd324834c914), [`4a1454beb3`](https://github.com/LedgerHQ/ledger-live/commit/4a1454beb3f86405ba2686e07879c12a7d35ad8e), [`db1a6f92e1`](https://github.com/LedgerHQ/ledger-live/commit/db1a6f92e17dcd63b0c9fa6700496f5f4722f1e5), [`66fdfef314`](https://github.com/LedgerHQ/ledger-live/commit/66fdfef314b6dd63cfd74f00c579138b900ee241), [`d1aa522db7`](https://github.com/LedgerHQ/ledger-live/commit/d1aa522db75f7ea850efe412abaa4dc7d37af6b7), [`5bc987cd8f`](https://github.com/LedgerHQ/ledger-live/commit/5bc987cd8f850bb63e4ced62c28218d7c75744e8), [`ebe5b07afe`](https://github.com/LedgerHQ/ledger-live/commit/ebe5b07afec441ea3e2d9103da9e1175972add47), [`42d8be7694`](https://github.com/LedgerHQ/ledger-live/commit/42d8be76949e258d6360a1fda3ca5a1df50c8bcb), [`ac205cce9f`](https://github.com/LedgerHQ/ledger-live/commit/ac205cce9f328165369c5c270681be1d7ba7d0f2)]:
- @ledgerhq/live-common@31.1.0-next.0
- @ledgerhq/errors@6.12.7-next.0
- @ledgerhq/cryptoassets@9.8.0-next.0
- @ledgerhq/coin-framework@0.3.6-next.0
- @ledgerhq/hw-transport@6.28.5-next.0
- @ledgerhq/hw-transport-http@6.27.16-next.0
- @ledgerhq/hw-transport-node-ble@6.27.16-next.0
- @ledgerhq/hw-transport-node-hid@6.27.16-next.0
- @ledgerhq/hw-transport-node-speculos@6.27.16-next.0
- @ledgerhq/live-network@1.1.1-next.0
- @ledgerhq/hw-app-btc@10.0.5-next.0
- @ledgerhq/hw-transport-mocker@6.27.16-next.0

## 22.9.0

### Minor Changes
Expand Down
4 changes: 3 additions & 1 deletion apps/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ledgerhq/live-cli",
"version": "22.9.0",
"version": "22.9.1",
"description": "ledger-live CLI version",
"repository": {
"type": "git",
Expand All @@ -22,6 +22,8 @@
"prepublishOnly": "rm -rf lib && tsc --project src/tsconfig.json",
"watch": "tsc --watch --project src/tsconfig.json",
"typecheck": "tsc --noEmit",
"lint": "eslint src --cache",
"lint:fix": "pnpm lint --fix",
"test": "zx ./scripts/test.mjs"
},
"peerDependencies": {
Expand Down
1 change: 0 additions & 1 deletion apps/cli/scripts/gen.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ async function gen() {
${clean},`;
}

exprts = exprts.substring(0, exprts.length - 1);
exprts += `
};
`;
Expand Down
Loading

2 comments on commit 518c336

@vercel
Copy link

@vercel vercel bot commented on 518c336 Jun 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on 518c336 Jun 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.