Release / 4.15.100

.github/workflows/tests.yml

@@ -38,10 +38,9 @@ jobs:
       - name: tests
         run: |
           npm run test
-
   E2E_tests_dApp_Chrome:
     if: github.event.review && (github.event.review.state == 'approved' || contains(github.event.review.body, '/check'))
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
       - name: Forcefully update the Chrome browser
@@ -96,6 +95,8 @@ jobs:
           touch ./reports/cucumberReports.json
       - name: Run dapp connector tests
         working-directory: ./packages/yoroi-extension
+        env:
+          MAILSAC_API_KEY: ${{ secrets.MAILSAC_API_KEY }}
         run: npm run test:run:e2e:dApp:chrome
       - name: Archive tests screenshots and logs
         if: ${{ failure() }}
@@ -106,7 +107,7 @@ jobs:
 
   E2E_tests_dApp_FF:
     if: github.event.review && (github.event.review.state == 'approved' || contains(github.event.review.body, '/check') || contains(github.event.review.body, '/run_dapp_ff'))
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
       - name: Forcefully install Firefox for Developers browser
@@ -165,6 +166,8 @@ jobs:
           touch ./reports/cucumberReports.json
       - name: Run dapp connector tests
         working-directory: ./packages/yoroi-extension
+        env:
+          MAILSAC_API_KEY: ${{ secrets.MAILSAC_API_KEY }}
         run: npm run test:run:e2e:dApp:firefox
       - name: Archive tests screenshots and logs
         if: ${{ failure() }}

.github/workflows/tests_hw_emulators.yml

@@ -0,0 +1,246 @@
+name: Tests with HW emulators
+
+on:
+  pull_request_review:
+    types: [ submitted ]
+
+jobs:
+  Trezor_Model_T_Chrome:
+    if: github.event.review && (github.event.review.state == 'approved' || contains(github.event.review.body, '/check'))
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Forcefully update the Chrome browser
+        run: |
+          wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+          sudo sh -c 'echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list'
+          sudo apt-get update
+          sudo apt-get --only-upgrade install google-chrome-stable
+
+      - name: Clone the trezor-usr-env
+        run: |
+          cd ..
+          git clone https://github.com/trezor/trezor-user-env.git
+
+      - name: Install nix-shell
+        run: |
+          sudo apt update
+          sudo apt -y install nix-bin
+
+      - name: Download firmware
+        working-directory: ../trezor-user-env/src/binaries/firmware/bin/
+        run: |
+          sed '/^.*R_LATEST_BUILD.*$/d' download.sh | sed '/^.*trezor_r_master.*$/d' > temp_file.sh
+          rm download.sh
+          mv temp_file.sh download.sh
+          chmod +x download.sh
+          sudo ./download.sh
+
+      - name: Download trezord-go
+        working-directory: ../trezor-user-env
+        run: sudo ./src/binaries/trezord-go/bin/download.sh
+
+      - name: Copy the v2-master firmware to the root of the project
+        working-directory: ../trezor-user-env
+        run: cp -rf src/binaries/firmware/bin/trezor-emu-core-v2-master ./
+
+      - name: Copy the trezord-go-v2.0.31 to the root of the project
+        working-directory: ../trezor-user-env
+        run: cp -rf src/binaries/trezord-go/bin/trezord-go-v2.0.31 ./
+
+      - name: Create the logs folder in the root of the trezor-user-env
+        working-directory: ../trezor-user-env
+        run: mkdir logs
+
+      - name: Run the trezor user environment
+        working-directory: ../trezor-user-env
+        run: sudo docker run -p 9001:9001 -p 9002:9002 -p 21326:21326 -p 127.0.0.1:21325:21326 -p 21324:21324 -v logs:/trezor-user-env/logs/screens -v trezor-emu-core-v2-master:/trezor-user-env/src/binaries/firmware/bin/user_downloaded -v trezord-go-v2.0.31:/trezor-user-env/src/binaries/trezord-go/bin -d emurgornd/trezor-user-env:latest
+
+      - uses: actions/checkout@v3
+
+      - name: Read .nvmrc
+        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
+        id: nvm
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: '${{ steps.nvm.outputs.NVMRC }}'
+
+      - name: Cache extension node modules
+        # https://docs.github.com/en/actions/guides/caching-dependencies-to-speed-up-workflows
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-yoroi-extension-node-modules
+        with:
+          # https://github.com/actions/cache/blob/main/examples.md#node---npm
+          # It is recommended to cache the NPM cache (~/.npm) instead of node_modules.
+          # But we put node version into the cache key and cache node_modules.
+          path: packages/yoroi-extension/node_modules
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-node-${{ steps.nvm.outputs.NVMRC }}-${{ hashFiles('packages/yoroi-extension/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Cache connector node modules
+        # https://docs.github.com/en/actions/guides/caching-dependencies-to-speed-up-workflows
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-yoroi-connector-node-modules
+        with:
+          # https://github.com/actions/cache/blob/main/examples.md#node---npm
+          # It is recommended to cache the NPM cache (~/.npm) instead of node_modules.
+          # But we put node version into the cache key and cache node_modules.
+          path: packages/yoroi-ergo-connector/node_modules
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-node-${{ steps.nvm.outputs.NVMRC }}-${{ hashFiles('packages/yoroi-ergo-connector/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: npm install
+        run: |
+          . install-all.sh
+
+      - name: Build the test version using emulators
+        working-directory: ./packages/yoroi-extension
+        run: npm run test:build
+
+      - name: Create the report's folder
+        working-directory: ./packages/yoroi-extension
+        run: |
+          mkdir reports
+          touch ./reports/cucumberReports.json
+
+      - name: Run tests
+        working-directory: ./packages/yoroi-extension
+        run: xvfb-run -a -e /dev/stdout -s "-screen 0 1920x1080x24" npm run test:run:e2e:trezor:chrome
+
+      - name: Archive tests screenshots and logs
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: testRunsData
+          path: ./packages/yoroi-extension/testRunsData
+
+  Trezor_Model_T_Firefox:
+    if: github.event.review && (github.event.review.state == 'approved' || contains(github.event.review.body, '/check'))
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Install Firefox Developer Edition
+        run: |
+          wget -c "https://download.mozilla.org/?product=firefox-devedition-latest-ssl&os=linux64&lang=en-US" -O - | sudo tar -xj -C /opt
+          sudo rm -rf /opt/firefoxdev
+          sudo mv /opt/firefox /opt/firefoxdev
+
+      - name: Set up env variable for FF
+        run: echo "FIREFOX_DEV=/opt/firefoxdev/firefox-bin" >> $GITHUB_ENV
+
+      - name: Clone the trezor-usr-env
+        run: |
+          cd ..
+          git clone https://github.com/trezor/trezor-user-env.git
+
+      - name: Install nix-shell
+        run: |
+          sudo apt update
+          sudo apt -y install nix-bin
+
+      - name: Download firmware
+        working-directory: ../trezor-user-env/src/binaries/firmware/bin/
+        run: |
+          sed '/^.*R_LATEST_BUILD.*$/d' download.sh | sed '/^.*trezor_r_master.*$/d' > temp_file.sh
+          rm download.sh
+          mv temp_file.sh download.sh
+          chmod +x download.sh
+          sudo ./download.sh
+
+      - name: Download trezord-go
+        working-directory: ../trezor-user-env
+        run: sudo ./src/binaries/trezord-go/bin/download.sh
+
+      - name: Copy the v2-master firmware to the root of the project
+        working-directory: ../trezor-user-env
+        run: cp -rf src/binaries/firmware/bin/trezor-emu-core-v2-master ./
+
+      - name: Copy the trezord-go-v2.0.31 to the root of the project
+        working-directory: ../trezor-user-env
+        run: cp -rf src/binaries/trezord-go/bin/trezord-go-v2.0.31 ./
+
+      - name: Create the logs folder in the root of the trezor-user-env
+        working-directory: ../trezor-user-env
+        run: mkdir logs
+
+      - name: Run the trezor user environment
+        working-directory: ../trezor-user-env
+        run: sudo docker run -p 9001:9001 -p 9002:9002 -p 21326:21326 -p 127.0.0.1:21325:21326 -p 21324:21324 -v logs:/trezor-user-env/logs/screens -v trezor-emu-core-v2-master:/trezor-user-env/src/binaries/firmware/bin/user_downloaded -v trezord-go-v2.0.31:/trezor-user-env/src/binaries/trezord-go/bin -d emurgornd/trezor-user-env:latest
+
+      - uses: actions/checkout@v3
+
+      - name: Read .nvmrc
+        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
+        id: nvm
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: '${{ steps.nvm.outputs.NVMRC }}'
+
+      - name: Cache extension node modules
+        # https://docs.github.com/en/actions/guides/caching-dependencies-to-speed-up-workflows
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-yoroi-extension-node-modules
+        with:
+          # https://github.com/actions/cache/blob/main/examples.md#node---npm
+          # It is recommended to cache the NPM cache (~/.npm) instead of node_modules.
+          # But we put node version into the cache key and cache node_modules.
+          path: packages/yoroi-extension/node_modules
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-node-${{ steps.nvm.outputs.NVMRC }}-${{ hashFiles('packages/yoroi-extension/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Cache connector node modules
+        # https://docs.github.com/en/actions/guides/caching-dependencies-to-speed-up-workflows
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-yoroi-connector-node-modules
+        with:
+          # https://github.com/actions/cache/blob/main/examples.md#node---npm
+          # It is recommended to cache the NPM cache (~/.npm) instead of node_modules.
+          # But we put node version into the cache key and cache node_modules.
+          path: packages/yoroi-ergo-connector/node_modules
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-node-${{ steps.nvm.outputs.NVMRC }}-${{ hashFiles('packages/yoroi-ergo-connector/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: npm install
+        run: |
+          . install-all.sh
+
+      - name: Build the test version using emulators
+        working-directory: ./packages/yoroi-extension
+        run: npm run test:build
+
+      - name: Create the report's folder
+        working-directory: ./packages/yoroi-extension
+        run: |
+          mkdir reports
+          touch ./reports/cucumberReports.json
+
+      - name: Run tests with the trezor emulator
+        working-directory: ./packages/yoroi-extension
+        run: xvfb-run -a -e /dev/stdout -s "-screen 0 1920x1080x24" npm run test:run:e2e:trezor:firefox
+
+      - name: Archive tests screenshots and logs
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: testRunsData
+          path: ./packages/yoroi-extension/testRunsData

packages/yoroi-ergo-connector/example-cardano/index.html

@@ -27,6 +27,9 @@ <h1 class="display-4 text-center">Cardano dApp Example</h1>
         <div class="col-6 mb-4">
           <button id="is-enabled"  class="btn btn-light w-100" >Is Enabled</button>
         </div>
+        <div class="col-6 mb-4">
+          <button id="get-network-id"  class="btn btn-light w-100" >Get Network Id</button>
+        </div>
         <div class="col-6 mb-4">
           <button id="get-balance"  class="btn btn-light w-100" >Get Account Balance</button>
         </div>

packages/yoroi-ergo-connector/example-cardano/index.js

@@ -26,6 +26,7 @@ const signData = document.querySelector('#sign-data');
 const alertEl = document.querySelector('#alert');
 const spinner = document.querySelector('#spinner');
 const getNFTs = document.getElementById('nfts');
+const getNetworkId = document.getElementById('get-network-id');
 
 let accessGranted = false;
 let cardanoApi;
@@ -178,6 +179,18 @@ isEnabledBtn.addEventListener('click', () => {
   });
 });
 
+getNetworkId.addEventListener('click', () => {
+  if (!accessGranted) {
+    alertError('Should request access first');
+  } else {
+    toggleSpinner('show');
+    cardanoApi.getNetworkId().then(networkId => {
+      console.log('[getNetworkId]', networkId);
+      toggleSpinner('hide');
+    });
+  }
+});
+
 getAccountBalance.addEventListener('click', () => {
   if (!accessGranted) {
     alertError('Should request access first');

packages/yoroi-ergo-connector/src/inject.js

@@ -211,8 +211,7 @@ class CardanoAPI {
     }) 
 
     getNetworkId() {
-      // TODO
-      throw new Error('Not implemented yet');
+      return this._cardano_rpc_call("get_network_id", []);
     }
 
     getBalance(token_id = '*') {

packages/yoroi-extension/app/api/ada/lib/storage/database/primitives/tables.js

@@ -470,14 +470,26 @@ export const AddressMappingSchema: {|
   }
 };
 
+export type NFTMetadata = {|
+  name: string,
+  image: string | Array<string>,
+  mediaType?: ?string,
+  description: ?(string | Array<string>),
+  files?: ?Array<{|
+    name?: ?string,
+    mediaType?: ?string,
+    src?: ?(string | Array<string>),
+  |}>
+|};
+
 export type CardanoAssetMintMetadata = {|
   // transaction_metadatum_label: 721 for NFTs
   // See CIP 721
   // https://github.com/cardano-foundation/CIPs/blob/8b1f2f0900d81d6233e9805442c2b42aa1779d2d/CIP-NFTMetadataStandard.md
   [key: string]: {|
     version?: ?string,
     [policyID: string]: {|
-      [assetNameHex: string]: any
+      [assetNameHex: string]: NFTMetadata
     |}
   |}
 |}
@@ -512,7 +524,7 @@ export type TokenMetadata = {|
   // empty string for ADA
   +assetName: string,
   ...CommonMetadata,
-  +assetMintMetadata?: ?Array<CardanoAssetMintMetadata | any> | any
+  +assetMintMetadata?: Array<CardanoAssetMintMetadata>
 |};
 
 export type TokenInsert = {|