Merge branch 'develop' into feat/remote-notifications

apps/wallet-mobile/package.json

@@ -101,7 +101,7 @@
     "@emurgo/csl-mobile-bridge": "^7.1.0",
     "@emurgo/msl-mobile-bridge": "^1.0.4",
     "@emurgo/react-native-hid": "5.15.8",
-    "@emurgo/yoroi-lib": "2.2.2",
+    "@emurgo/yoroi-lib": "^2.2.3",
     "@formatjs/intl-datetimeformat": "^6.7.0",
     "@formatjs/intl-getcanonicallocales": "^2.1.0",
     "@formatjs/intl-locale": "^3.2.1",

apps/wallet-mobile/src/features/Discover/common/ledger.ts

@@ -220,6 +220,15 @@ export async function toLedgerSignRequest(
   additionalRequiredSigners: Array<string> = [],
 ): Promise<SignTransactionRequest> {
   const parsedCbor = await cbor.decode(rawTxBody)
+  const tagsState = await csl.hasTransactionSetTag(
+    await (await csl.FixedTransaction.newFromBodyBytes(await txBody.toBytes())).toBytes(),
+  )
+
+  if (tagsState === csl.TransactionSetsState.MixedSets) {
+    throw new Error('Transaction with mixed sets cannot be signed by Ledger')
+  }
+
+  const txHasSetTags = tagsState === csl.TransactionSetsState.AllSetsHaveTag
 
   async function formatInputs(inputs: TransactionInputs): Promise<Array<TxInput>> {
     const formatted = []
@@ -533,6 +542,9 @@ export async function toLedgerSignRequest(
       referenceInputs: formattedReferenceInputs,
     },
     additionalWitnessPaths,
+    options: {
+      tagCborSets: txHasSetTags,
+    },
   }
 }
 

apps/wallet-mobile/src/features/Discover/useDappConnectorManager.tsx

@@ -278,7 +278,7 @@ export const useSignTxWithHW = () => {
 
   const mutation = useMutation<Transaction, Error, {cbor: string; partial?: boolean}>({
     mutationFn,
-    useErrorBoundary: (error) => !isUserRejectedError(error),
+    useErrorBoundary: (error) => !isUserRejectedError(error) && !error.message.toLowerCase().includes('rejected'),
     mutationKey: ['useSignTxWithHW'],
   })
 

apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts

@@ -13,6 +13,7 @@ import _ from 'lodash'
 import {defaultMemoize} from 'reselect'
 import {Observable} from 'rxjs'
 
+import {toLedgerSignRequest} from '../../features/Discover/common/ledger'
 import {buildPortfolioBalanceManager} from '../../features/Portfolio/common/helpers/build-balance-manager'
 import {toBalanceManagerSyncArgs} from '../../features/Portfolio/common/transformers/toBalanceManagerSyncArgs'
 import {makeMemosManager, MemosManager} from '../../features/Transactions/common/memos/memosManager'
@@ -40,7 +41,6 @@ import {Cardano, CardanoMobile} from '../wallets'
 import {AccountManager, accountManagerMaker, Addresses} from './account-manager/account-manager'
 import * as legacyApi from './api/api'
 import {calcLockedDeposit} from './assetUtils'
-import {createSwapCancellationLedgerPayload} from './common/signatureUtils'
 import {filterAddressesByStakingKey, getDelegationStatus} from './delegationUtils'
 import {
   doesCardanoAppVersionSupportCIP36,
@@ -64,7 +64,7 @@ import {
   YoroiWallet,
 } from './types'
 import {yoroiUnsignedTx} from './unsignedTx/unsignedTx'
-import {deriveRewardAddressHex, toRecipients} from './utils'
+import {deriveRewardAddressHex, getAddressedUtxos, getHexAddressingMap, toRecipients} from './utils'
 import {makeUtxoManager, UtxoManager} from './utxoManager/utxoManager'
 import {utxosMaker} from './utxoManager/utxos'
 
@@ -882,22 +882,26 @@ export const makeCardanoWallet = (networkManager: Network.Manager, implementatio
     }
 
     async signSwapCancellationWithLedger(cbor: string, useUSB: boolean, hwDeviceInfo: HW.DeviceInfo): Promise<void> {
-      const stakeVkeyHash = await this.getStakingKey().then((key) => key.hash())
-      const payload = await createSwapCancellationLedgerPayload(
-        cbor,
-        this,
+      const tx = await CardanoMobile.Transaction.fromHex(cbor)
+      const txBody = await tx.body()
+      const payload = await toLedgerSignRequest(
+        CardanoMobile,
+        txBody,
         this.networkManager.chainId,
         this.networkManager.protocolMagic,
-        (address: string) => this.getAddressing(address),
-        stakeVkeyHash,
+        await getHexAddressingMap(CardanoMobile, this),
+        await getHexAddressingMap(CardanoMobile, this),
+        getAddressedUtxos(this),
+        await txBody.toBytes(),
+        [],
       )
 
       const signedLedgerTx = await signTxWithLedger(payload, hwDeviceInfo, useUSB)
 
       const bytes = await createSignedLedgerTxFromCbor(
         CardanoMobile,
         cbor,
-        signedLedgerTx.witnesses,
+        signedLedgerTx,
         implementationConfig.derivations.base.harden.purpose,
         this.publicKeyHex,
       )

apps/wallet-mobile/src/yoroi-wallets/cardano/cip30/cip30-ledger.ts

@@ -1,15 +1,13 @@
-import {Transaction, WasmModuleProxy} from '@emurgo/cross-csl-core'
-import {has_transaction_set_tag, TransactionSetsState} from '@emurgo/csl-mobile-bridge'
+import {Transaction} from '@emurgo/cross-csl-core'
 import {createSignedLedgerTxFromCbor} from '@emurgo/yoroi-lib'
-import {normalizeToAddress} from '@emurgo/yoroi-lib/dist/internals/utils/addresses'
 import {HW, Wallet} from '@yoroi/types'
 
 import {toLedgerSignRequest} from '../../../features/Discover/common/ledger'
 import {cardanoConfig} from '../../../features/WalletManager/common/adapters/cardano/cardano-config'
-import type {RawUtxo} from '../../types/other'
 import {assertHasAllSigners} from '../common/signatureUtils'
 import {signTxWithLedger} from '../hw/hw'
-import {CardanoTypes, YoroiWallet} from '../types'
+import {YoroiWallet} from '../types'
+import {getAddressedUtxos, getHexAddressingMap} from '../utils'
 import {wrappedCsl} from '../wrappedCsl'
 
 export const cip30LedgerExtensionMaker = (wallet: YoroiWallet, meta: Wallet.Meta) => {
@@ -26,9 +24,9 @@ class CIP30LedgerExtension {
       if (!partial) await assertHasAllSigners(cbor, this.wallet, this.meta)
       const txBody = await tx.body()
 
-      const transactionSetTag = await has_transaction_set_tag(await tx.toBytes())
+      const transactionSetTag = await csl.hasTransactionSetTag(await tx.toBytes())
 
-      if (transactionSetTag === TransactionSetsState.MixedSets) {
+      if (transactionSetTag === csl.TransactionSetsState.MixedSets) {
         throw new Error('CIP30LedgerExtension.signTx: Mixed transaction sets are not supported when using a HW wallet')
       }
 
@@ -49,7 +47,7 @@ class CIP30LedgerExtension {
       const bytes = await createSignedLedgerTxFromCbor(
         csl,
         cbor,
-        signedLedgerTx.witnesses,
+        signedLedgerTx,
         implementationConfig.derivations.base.harden.purpose,
         this.wallet.publicKeyHex,
       )
@@ -59,35 +57,3 @@ class CIP30LedgerExtension {
     }
   }
 }
-
-const getHexAddressingMap = async (csl: WasmModuleProxy, wallet: YoroiWallet) => {
-  const addressedUtxos = wallet.utxos.map(async (utxo: RawUtxo) => {
-    const addressing = wallet.getAddressing(utxo.receiver)
-    const hexAddress = await normalizeToAddress(csl, utxo.receiver).then((a) => a?.toHex())
-
-    return {addressing, hexAddress}
-  })
-
-  const addressing = await Promise.all(addressedUtxos)
-  return addressing.reduce<{[addressHex: string]: Array<number>}>((acc, curr) => {
-    if (!curr.hexAddress) return acc
-    acc[curr.hexAddress] = curr.addressing.path
-    return acc
-  }, {})
-}
-
-const getAddressedUtxos = (wallet: YoroiWallet) => {
-  return wallet.utxos.map((utxo: RawUtxo): CardanoTypes.CardanoAddressedUtxo => {
-    const addressing = wallet.getAddressing(utxo.receiver)
-
-    return {
-      addressing,
-      txIndex: utxo.tx_index,
-      txHash: utxo.tx_hash,
-      amount: utxo.amount,
-      receiver: utxo.receiver,
-      utxoId: utxo.utxo_id,
-      assets: utxo.assets,
-    }
-  })
-}

apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts

@@ -1,5 +1,7 @@
 /* eslint-disable no-empty */
+import {WasmModuleProxy} from '@emurgo/cross-csl-core'
 import {SendToken} from '@emurgo/yoroi-lib'
+import {normalizeToAddress} from '@emurgo/yoroi-lib/dist/internals/utils/addresses'
 import {invalid} from '@yoroi/common'
 import {Balance, Chain, Portfolio, Wallet} from '@yoroi/types'
 import {BigNumber} from 'bignumber.js'
@@ -13,7 +15,7 @@ import {CardanoMobile} from '../wallets'
 import {toAssetNameHex, toPolicyId} from './api/utils'
 import {withMinAmounts} from './getMinAmounts'
 import {MultiToken} from './MultiToken'
-import {CardanoTypes} from './types'
+import {CardanoTypes, YoroiWallet} from './types'
 import {wrappedCsl as getCSL, wrappedCsl} from './wrappedCsl'
 
 export const deriveRewardAddressHex = async (
@@ -249,3 +251,35 @@ export const getTransactionUnspentOutput = async ({
     release()
   }
 }
+
+export const getHexAddressingMap = async (csl: WasmModuleProxy, wallet: YoroiWallet) => {
+  const addressedUtxos = wallet.utxos.map(async (utxo: RawUtxo) => {
+    const addressing = wallet.getAddressing(utxo.receiver)
+    const hexAddress = await normalizeToAddress(csl, utxo.receiver).then((a) => a?.toHex())
+
+    return {addressing, hexAddress}
+  })
+
+  const addressing = await Promise.all(addressedUtxos)
+  return addressing.reduce<{[addressHex: string]: Array<number>}>((acc, curr) => {
+    if (!curr.hexAddress) return acc
+    acc[curr.hexAddress] = curr.addressing.path
+    return acc
+  }, {})
+}
+
+export const getAddressedUtxos = (wallet: YoroiWallet) => {
+  return wallet.allUtxos.map((utxo: RawUtxo): CardanoTypes.CardanoAddressedUtxo => {
+    const addressing = wallet.getAddressing(utxo.receiver)
+
+    return {
+      addressing,
+      txIndex: utxo.tx_index,
+      txHash: utxo.tx_hash,
+      amount: utxo.amount,
+      receiver: utxo.receiver,
+      utxoId: utxo.utxo_id,
+      assets: utxo.assets,
+    }
+  })
+}

packages/swap/package.json

@@ -139,7 +139,6 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^17.0.2",
-    "@emurgo/yoroi-lib": "^2.0.0",
     "@react-native-async-storage/async-storage": "^1.19.3",
     "@react-native-community/eslint-config": "^3.0.2",
     "@release-it/conventional-changelog": "^5.0.0",

yarn.lock

@@ -2167,25 +2167,10 @@
     "@ledgerhq/logs" "^5.15.0"
     rxjs "^6.5.5"
 
-"@emurgo/[email protected]":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-2.2.2.tgz#e5575fedb123c36c78a08e28d60149fcb67cde0b"
-  integrity sha512-XhC+2+F9pa3mUorCKixL9WIFGUjkN/u/MH3tsMHaNKfRwnEaWkXMfQZmN/WAposEi5r5rnwb7I3vRTB94srZow==
-  dependencies:
-    "@cardano-foundation/ledgerjs-hw-app-cardano" "^7.1.3"
-    "@emurgo/cross-csl-core" "6.1.0"
-    "@noble/hashes" "^1.3.2"
-    axios "^1.7.5"
-    axios-cache-interceptor "^1.5.3"
-    bech32 "^2.0.0"
-    bignumber.js "^9.0.1"
-    blake2b "2.1.4"
-    easy-crc "1.1.0"
-
-"@emurgo/yoroi-lib@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-2.0.0.tgz#5f8361a942f9aa8094c842ffece1893cc33f7b63"
-  integrity sha512-uXeUVHKEE633iBsEGxpbgK/NrXZzBvWRWGk1//rC9ZQsHNhGzSqgr99k4O9b6XjTBxZf7Yndrs8vdpEwEKVFyw==
+"@emurgo/yoroi-lib@^2.2.3":
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-2.2.3.tgz#3ba19fadd837e1ae7b209be13b05c119ee71dfae"
+  integrity sha512-J72qa93jipD9lXB6TbATZlq/k129afMaCzqlMbnvB6WIvqGXQL9VPnbiLCdDMBGKuIppgNEt3ir9cFgSH09OsQ==
   dependencies:
     "@cardano-foundation/ledgerjs-hw-app-cardano" "^7.1.3"
     "@emurgo/cross-csl-core" "6.1.0"