Merge branch 'main' into feat/lw-10259-improve-copy-paste-mnemonics

input-output-hk · Apr 30, 2024 · e0d9b8e · e0d9b8e
2 parents e37c219 + 3ca0833
commit e0d9b8e
Show file tree

Hide file tree

Showing 16 changed files with 213 additions and 286 deletions.
diff --git a/.github/workflows/build-dev-preview.yml b/.github/workflows/build-dev-preview.yml
@@ -5,7 +5,10 @@ on:
 jobs:
   build:
     name: Build + test
-    runs-on: ubuntu-22.04
+    runs-on: self-hosted
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,10 @@ permissions:
 jobs:
   buildAndTest:
     name: Build & Test
-    runs-on: ubuntu-20.04
+    runs-on: self-hosted
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/e2e-tests-linux.yml b/.github/workflows/e2e-tests-linux.yml
@@ -37,7 +37,10 @@ env:
 
 jobs:
   tests:
-    runs-on: ubuntu-22.04
+    runs-on: self-hosted
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/e2e-tests-win.yml b/.github/workflows/e2e-tests-win.yml
@@ -36,7 +36,10 @@ env:
 
 jobs:
   build-extension-linux:
-    runs-on: ubuntu-22.04
+    runs-on: self-hosted
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/packages-staking.yml b/.github/workflows/packages-staking.yml
@@ -15,11 +15,11 @@ on:
 jobs:
   build_staking:
     name: Build Staking Center
-    runs-on: ubuntu-22.04
-    container: mcr.microsoft.com/playwright:v1.32.2-jammy
+    runs-on: self-hosted
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
     steps:
-      - name: Setup Build Essential
-        run: apt-get update && apt-get install build-essential -y
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
@@ -46,19 +46,3 @@ jobs:
         run: yarn workspace @lace/staking test:unit
       - name: Build Staking dist
         run: yarn workspace @lace/staking build
-#        TODO fix ladle build
-#      - name: Build Ladle
-#        run: yarn workspace @lace/staking story:build
-#      - name: Upload Ladle artifacts
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: staking-ladle
-#          path: packages/staking/build
-#      - name: Run visual regression
-#        continue-on-error: true
-#        run: yarn workspace @lace/staking test:vr
-#      - name: Upload visual regression
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: staking-visual-regression
-#          path: packages/staking/.lostpixel
diff --git a/.github/workflows/post-integration.yml b/.github/workflows/post-integration.yml
@@ -7,7 +7,10 @@ on:
 
 jobs:
   publish:
-    runs-on: ubuntu-20.04
+    runs-on: self-hosted
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
@@ -17,7 +17,10 @@ env:
 jobs:
   smokeTests:
     name: Smoke Tests
-    runs-on: ubuntu-22.04
+    runs-on: self-hosted
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/staking-chromatic.yml b/.github/workflows/staking-chromatic.yml
@@ -14,7 +14,10 @@ on:
 jobs:
   chromatic-deployment:
     if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

diff --git a/apps/browser-extension-wallet/package.json b/apps/browser-extension-wallet/package.json
@@ -39,14 +39,14 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@cardano-sdk/cardano-services-client": "0.19.1",
-    "@cardano-sdk/core": "0.30.1",
-    "@cardano-sdk/dapp-connector": "0.12.15",
-    "@cardano-sdk/input-selection": "0.12.28",
-    "@cardano-sdk/tx-construction": "0.18.4",
+    "@cardano-sdk/cardano-services-client": "0.19.2",
+    "@cardano-sdk/core": "0.30.2",
+    "@cardano-sdk/dapp-connector": "0.12.16",
+    "@cardano-sdk/input-selection": "0.12.29",
+    "@cardano-sdk/tx-construction": "0.18.5",
     "@cardano-sdk/util": "0.15.1",
-    "@cardano-sdk/wallet": "0.37.2",
-    "@cardano-sdk/web-extension": "0.27.2",
+    "@cardano-sdk/wallet": "0.37.3",
+    "@cardano-sdk/web-extension": "0.27.3",
     "@emurgo/cip14-js": "~3.0.1",
     "@koralabs/handles-public-api-interfaces": "^1.6.6",
     "@lace/cardano": "0.1.0",

diff --git a/bump-cardano-js-sdk.sh b/bump-cardano-js-sdk.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env
+
+# Requirements: Linux/Mac, curl and jq
+
+# Script to update @cardano-sdk/* dependencies, peerDependencies and devDependencies in all package.json files within the lace monorepo
+
+# Using find to locate all package.json files in the monorepo.
+find "." -type d -name 'node_modules' -prune -o -type f -name 'package.json' -print | while IFS= read -r package_file; do
+    echo "Processing $package_file"
+
+    # Function to update a given section (dependencies, peerDependencies or devDependencies)
+    function update_dependencies {
+        dep_type="$1"  # either "dependencies", "peerDependencies" or "devDependencies"
+        jq -r "if .$dep_type then .$dep_type | keys[] | select(startswith(\"@cardano-sdk/\")) else empty end" "$package_file" | while IFS= read -r package; do
+            echo "Updating $package in $dep_type of $package_file"
+            latest_version=$(curl -s "https://registry.npmjs.org/$package" | jq -r '.["dist-tags"].latest')
+            if [ -z "$latest_version" ]; then
+                echo "Failed to fetch latest version for $package"
+                continue
+            fi
+            jq --arg pkg "$package" --arg ver "$latest_version" ".$dep_type[\$pkg] = \$ver" "$package_file" > "$package_file.tmp" && mv "$package_file.tmp" "$package_file"
+            echo "Updated $package to version $latest_version in $dep_type of $package_file"
+        done
+    }
+
+    # Update dependencies, peerDependencies and devDependencies
+    update_dependencies "dependencies"
+    update_dependencies "devDependencies"
+    update_dependencies "peerDependencies"
+done
+
+yarn install
+echo "Yarn install completed."
+
+echo "Dependency updates complete."
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "browser": "APP_NAME=browser-extension-wallet yarn $0",
     "build": "yarn base-command-for-build-scripts -c build",
     "build-deps": "EXCLUDE_APP=true yarn build",
+    "bump-cardano-js-sdk": "sh bump-cardano-js-sdk.sh",
     "cardano:lint": "yarn eslint-cmd \"packages/cardano/**/*.{js,ts,tsx}\"",
     "chromatic": "ENV=development yarn build-storybook; chromatic --exit-zero-on-changes --project-token=e28776c940b9 -d storybook-static/",
     "cleanup": "yarn workspaces foreach run cleanup && yarn exec rm -rf node_modules storybook-static && rm -rf .cache/eslintcache",

diff --git a/packages/cardano/package.json b/packages/cardano/package.json
@@ -38,15 +38,15 @@
     "watch": "yarn build --watch"
   },
   "dependencies": {
-    "@cardano-sdk/cardano-services-client": "0.19.0",
-    "@cardano-sdk/core": "0.30.1",
+    "@cardano-sdk/cardano-services-client": "0.19.2",
+    "@cardano-sdk/core": "0.30.2",
     "@cardano-sdk/crypto": "0.1.23",
-    "@cardano-sdk/hardware-ledger": "0.9.2",
-    "@cardano-sdk/hardware-trezor": "0.4.22",
-    "@cardano-sdk/key-management": "0.20.2",
+    "@cardano-sdk/hardware-ledger": "0.9.3",
+    "@cardano-sdk/hardware-trezor": "0.4.23",
+    "@cardano-sdk/key-management": "0.20.3",
     "@cardano-sdk/util": "0.15.1",
-    "@cardano-sdk/wallet": "0.37.2",
-    "@cardano-sdk/web-extension": "0.27.2",
+    "@cardano-sdk/wallet": "0.37.3",
+    "@cardano-sdk/web-extension": "0.27.3",
     "@lace/common": "0.1.0",
     "@ledgerhq/devices": "^8.2.1",
     "@stablelib/chacha20poly1305": "1.0.1",
@@ -68,7 +68,7 @@
     "webextension-polyfill": "0.8.0"
   },
   "devDependencies": {
-    "@cardano-sdk/util-dev": "0.19.18",
+    "@cardano-sdk/util-dev": "0.20.2",
     "@emurgo/cardano-message-signing-browser": "1.0.1",
     "rollup-plugin-polyfill-node": "^0.8.0",
     "typescript": "^4.9.5"

diff --git a/packages/e2e-tests/src/assert/topNavigationAssert.ts b/packages/e2e-tests/src/assert/topNavigationAssert.ts
@@ -77,7 +77,6 @@ class TopNavigationAssert {
 
   async assertWalletIsInSyncedStatus() {
     await settingsExtendedPageObject.waitUntilHdWalletSynced();
-    await settingsExtendedPageObject.multiAddressModalConfirm();
     await this.assertLogoPresent();
     await MenuHeader.menuButton.waitForDisplayed();
     await MenuHeader.menuButton.click();

diff --git a/packages/e2e-tests/src/elements/faqPage.ts b/packages/e2e-tests/src/elements/faqPage.ts
@@ -1,16 +1,19 @@
+/* eslint-disable no-undef */
+import { ChainablePromiseElement } from 'webdriverio';
+
 class FaqPage {
   private PAGE_TITLE = 'h1';
   private ACTIVE_ARTICLE = 'div[data-active="true"]';
-  private ACTIVE_ARTICLE_TITLE = `${this.ACTIVE_ARTICLE} span`;
+  private ACTIVE_ARTICLE_TITLE = `${this.ACTIVE_ARTICLE} button`;
 
-  get pageTitle() {
+  get pageTitle(): ChainablePromiseElement<WebdriverIO.Element> {
     return $(this.PAGE_TITLE);
   }
-  get activeArticle() {
+  get activeArticle(): ChainablePromiseElement<WebdriverIO.Element> {
     return $(this.ACTIVE_ARTICLE);
   }
 
-  get activeArticleTitle() {
+  get activeArticleTitle(): ChainablePromiseElement<WebdriverIO.Element> {
     return $(this.ACTIVE_ARTICLE_TITLE);
   }
 }

diff --git a/packages/staking/package.json b/packages/staking/package.json
@@ -71,12 +71,12 @@
   },
   "devDependencies": {
     "@babel/core": "^7.21.0",
-    "@cardano-sdk/core": "0.30.1",
-    "@cardano-sdk/input-selection": "0.12.28",
-    "@cardano-sdk/tx-construction": "0.18.4",
+    "@cardano-sdk/core": "0.30.2",
+    "@cardano-sdk/input-selection": "0.12.29",
+    "@cardano-sdk/tx-construction": "0.18.5",
     "@cardano-sdk/util": "0.15.1",
-    "@cardano-sdk/wallet": "0.37.2",
-    "@cardano-sdk/web-extension": "0.27.2",
+    "@cardano-sdk/wallet": "0.37.3",
+    "@cardano-sdk/web-extension": "0.27.3",
     "@storybook/addon-actions": "^7.6.7",
     "@storybook/addon-essentials": "^7.6.7",
     "@storybook/addon-interactions": "^7.6.7",
@@ -122,11 +122,11 @@
     "wait-on": "^7.0.1"
   },
   "peerDependencies": {
-    "@cardano-sdk/input-selection": "0.12.26",
-    "@cardano-sdk/tx-construction": "0.18.2",
+    "@cardano-sdk/input-selection": "0.12.29",
+    "@cardano-sdk/tx-construction": "0.18.5",
     "@cardano-sdk/util": "0.15.1",
-    "@cardano-sdk/wallet": "0.36.0",
-    "@cardano-sdk/web-extension": "0.26.2",
+    "@cardano-sdk/wallet": "0.37.3",
+    "@cardano-sdk/web-extension": "0.27.3",
     "@lace/cardano": "^0.1.0",
     "@lace/common": "^0.1.0",
     "@lace/core": "0.1.0",