Resolve: Prepare v1.18.5

.github/workflows/build-linux.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-20.04]
 
     steps:
       - name: Checkout git repo

.github/workflows/build-macos.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macOS-latest]
+        os: [macOS-11]
 
     steps:
       - name: Checkout git repo

CHANGELOG.md

@@ -1,16 +1,21 @@
-# 1.18.5 (2022-12-xx)
+# 1.19.0 (2022-12-xx)
+
+## Add
+
+- [Savers] UI [#2485](https://github.com/thorchain/asgardex-electron/pull/2485)
+
+# 1.18.5 (2022-12-20)
 
 ## Add
 
 - Introduce `ActionButton` [#2452](https://github.com/thorchain/asgardex-electron/pull/2452)
 - [Swap] Show balances [#2446](https://github.com/thorchain/asgardex-electron/issues/2446)
-- ETH: Use depositWithExpiry to deposit [#2472](https://github.com/thorchain/asgardex-electron/issues/2472)
-- Add 'x-client-id' header to send ASGDX' identifier for any request to 9R servers [#2463](https://github.com/thorchain/asgardex-electron/issues/2463), [#2464](https://github.com/thorchain/asgardex-electron/pull/2464), [#2474](https://github.com/thorchain/asgardex-electron/pull/2474)
+- [ETH] Use `depositWithExpiry` to deposit [#2472](https://github.com/thorchain/asgardex-electron/issues/2472)
+- Add `x-client-id` header to send ASGDX' identifier for any request to 9R servers [#2463](https://github.com/thorchain/asgardex-electron/issues/2463), [#2464](https://github.com/thorchain/asgardex-electron/pull/2464), [#2474](https://github.com/thorchain/asgardex-electron/pull/2474)
 - [Savers] Routes [#2450](https://github.com/thorchain/asgardex-electron/pull/2450)
 - Add wallet actions to assets table [#2455](https://github.com/thorchain/asgardex-electron/pull/2455)
 - Savers overview [#2466](https://github.com/thorchain/asgardex-electron/pull/2466), [#2470](https://github.com/thorchain/asgardex-electron/pull/2470), [#2479](https://github.com/thorchain/asgardex-electron/pull/2479)
 - Display APY/APR depending on days [#2477](https://github.com/thorchain/asgardex-electron/pull/2477)
-- [Savers] UI [#2485](https://github.com/thorchain/asgardex-electron/pull/2485)
 
 ## Update
 
@@ -25,6 +30,7 @@
 - AssetsTableCollapsable: Combine balance/price [#2478](https://github.com/thorchain/asgardex-electron/pull/2478)
 - Update pools routes [#2482](https://github.com/thorchain/asgardex-electron/pull/2482)
 - [Ledger] Add a safety check of fees before signing txs [#2491](https://github.com/thorchain/asgardex-electron/issues/2491)
+- [Ledger] Update `@ledgerhq/hw-*` packages [#2494](https://github.com/thorchain/asgardex-electron/pull/2494)
 
 ## Fix
 
@@ -36,6 +42,8 @@
 
 - Update to latest Electron@22.0.0 / TypeScript@4.9.4[#2480](https://github.com/thorchain/asgardex-electron/pull/2480)
 - Downgrade to Electron@20.x.x [#2493](https://github.com/thorchain/asgardex-electron/pull/2493)
+- Update CI to deprecate Ubuntu 18.x in favour of building on Ubuntu 20.04 [#2494](https://github.com/thorchain/asgardex-electron/pull/2494)
+- Update CI to continue build support of `macOS-11` [#2494](https://github.com/thorchain/asgardex-electron/pull/2494)
 
 # 1.18.4 (2022-11-03)
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "asgardex",
   "productName": "ASGARDEX",
-  "version": "1.18.4",
+  "version": "1.18.5",
   "description": "WALLET AND EXCHANGE CLIENT FOR THORCHAIN",
   "main": "index.js",
   "scripts": {
@@ -75,11 +75,11 @@
     "@devexperts/utils": "^1.0.0-alpha.14",
     "@headlessui/react": "^1.6.6",
     "@heroicons/react": "^2.0.12",
-    "@ledgerhq/hw-app-btc": "6.7.0",
-    "@ledgerhq/hw-app-cosmos": "^6.27.1",
-    "@ledgerhq/hw-app-eth": "^6.28.2",
-    "@ledgerhq/hw-transport": "^6.27.1",
-    "@ledgerhq/hw-transport-node-hid-singleton": "^6.27.1",
+    "@ledgerhq/hw-app-btc": "^9.1.0",
+    "@ledgerhq/hw-app-cosmos": "^6.27.8",
+    "@ledgerhq/hw-app-eth": "^6.30.2",
+    "@ledgerhq/hw-transport": "^6.27.8",
+    "@ledgerhq/hw-transport-node-hid-singleton": "^6.28.5",
     "@openapitools/openapi-generator-cli": "^2.5.1",
     "@psf/bitcoincashjs-lib": "^4.0.2",
     "@thorchain/asgardex-midgard": "^1.1.0",

src/main/api/ledger/bitcoin/address.ts

@@ -16,7 +16,10 @@ export const getAddress = async (
   walletIndex: number
 ): Promise<E.Either<LedgerError, WalletAddress>> => {
   try {
-    const app = new AppBTC(transport)
+    // Value of `currency` -> `GetAddressOptions` -> `currency` -> `id`
+    // Example https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledger-live-common/src/families/bitcoin/hw-getAddress.ts#L17
+    // BTC -> `bitcoin` https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledgerjs/packages/cryptoassets/src/currencies.ts#L287
+    const app = new AppBTC({ transport, currency: 'bitcoin' })
     const clientNetwork = toClientNetwork(network)
     const derivePath = getDerivationPath(walletIndex, clientNetwork)
     const { bitcoinAddress } = await app.getWalletPublicKey(derivePath, {
@@ -34,7 +37,10 @@ export const getAddress = async (
 }
 
 export const verifyAddress: VerifyAddressHandler = async ({ transport, network, walletIndex }) => {
-  const app = new AppBTC(transport)
+  // Value of `currency` -> `GetAddressOptions` -> `currency` -> `id`
+  // Example https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledger-live-common/src/families/bitcoin/hw-getAddress.ts#L17
+  // BTC -> `bitcoin` https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledgerjs/packages/cryptoassets/src/currencies.ts#L287
+  const app = new AppBTC({ transport, currency: 'bitcoin' })
   const clientNetwork = toClientNetwork(network)
   const derivePath = getDerivationPath(walletIndex, clientNetwork)
   const _ = await app.getWalletPublicKey(derivePath, {

src/main/api/ledger/bitcoin/transaction.ts

@@ -48,7 +48,10 @@ export const send = async ({
     // @see https://github.com/xchainjs/xchainjs-lib/blob/21e1f65288b994de8b98cb779550e08c15f96314/packages/xchain-bitcoin/src/client.ts#L296
     checkFeeBounds({ lower: LOWER_FEE_BOUND, upper: UPPER_FEE_BOUND }, feeRate)
 
-    const app = new AppBTC(transport)
+    // Value of `currency` -> `GetAddressOptions` -> `currency` -> `id`
+    // Example https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledger-live-common/src/families/bitcoin/hw-getAddress.ts#L17
+    // BTC -> `bitcoin` https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledgerjs/packages/cryptoassets/src/currencies.ts#L287
+    const app = new AppBTC({ transport, currency: 'bitcoin' })
     const clientNetwork = toClientNetwork(network)
     const derivePath = getDerivationPath(walletIndex, clientNetwork)
 
@@ -91,7 +94,7 @@ export const send = async ({
 
     const outputScriptHex = app.serializeTransactionOutputs(newTx).toString('hex')
 
-    const txHex = await app.createPaymentTransactionNew({
+    const txHex = await app.createPaymentTransaction({
       inputs,
       associatedKeysets,
       outputScriptHex,

src/main/api/ledger/bitcoincash/address.ts

@@ -16,7 +16,10 @@ export const getAddress = async (
   walletIndex: number
 ): Promise<E.Either<LedgerError, WalletAddress>> => {
   try {
-    const app = new AppBTC(transport)
+    // Value of `currency` -> `GetAddressOptions` -> `currency` -> `id`
+    // Example https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledger-live-common/src/families/bitcoin/hw-getAddress.ts#L17
+    // BCH -> `bitcoin_cash` https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledgerjs/packages/cryptoassets/src/currencies.ts#L319
+    const app = new AppBTC({ transport, currency: 'bitcoin_cash' })
     const clientNetwork = toClientNetwork(network)
     const derivePath = getDerivationPath(walletIndex, clientNetwork)
     const { bitcoinAddress: bchAddress } = await app.getWalletPublicKey(derivePath, {
@@ -35,12 +38,15 @@ export const getAddress = async (
   }
 }
 export const verifyAddress: VerifyAddressHandler = async ({ transport, network, walletIndex }) => {
-  const app = new AppBTC(transport)
+  // Value of `currency` -> `GetAddressOptions` -> `currency` -> `id`
+  // Example https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledger-live-common/src/families/bitcoin/hw-getAddress.ts#L17
+  // BCH -> `bitcoin_cash` https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledgerjs/packages/cryptoassets/src/currencies.ts#L319
+  const app = new AppBTC({ transport, currency: 'bitcoin_cash' })
   const clientNetwork = toClientNetwork(network)
   const derivePath = getDerivationPath(walletIndex, clientNetwork)
   const _ = await app.getWalletPublicKey(derivePath, {
     // cashaddr in case of Bitcoin Cash
-    // @see https://github.com/LedgerHQ/ledgerjs/blob/master/packages/hw-app-btc/README.md#parameters-2
+    // @see https://github.com/LedgerHQ/ledger-live/tree/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledgerjs/packages/hw-app-btc#parameters-2
     format: 'cashaddr',
     verify: true // confirm the address on the device
   })

src/main/api/ledger/bitcoincash/transaction.ts

@@ -47,7 +47,10 @@ export const send = async ({
     // @see https://github.com/xchainjs/xchainjs-lib/blob/21e1f65288b994de8b98cb779550e08c15f96314/packages/xchain-bitcoincash/src/client.ts#L248
     checkFeeBounds({ lower: LOWER_FEE_BOUND, upper: UPPER_FEE_BOUND }, feeRate)
 
-    const app = new AppBTC(transport)
+    // Value of `currency` -> `GetAddressOptions` -> `currency` -> `id`
+    // Example https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledger-live-common/src/families/bitcoin/hw-getAddress.ts#L17
+    // BCH -> `bitcoin_cash` https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledgerjs/packages/cryptoassets/src/currencies.ts#L319
+    const app = new AppBTC({ transport, currency: 'bitcoin_cash' })
     const clientNetwork = toClientNetwork(network)
     const derivePath = getDerivationPath(walletIndex, clientNetwork)
 
@@ -80,7 +83,7 @@ export const send = async ({
 
     const newTx: Transaction = app.splitTransaction(newTxHex)
     const outputScriptHex = app.serializeTransactionOutputs(newTx).toString('hex')
-    const txHex = await app.createPaymentTransactionNew({
+    const txHex = await app.createPaymentTransaction({
       inputs,
       associatedKeysets,
       outputScriptHex,

src/main/api/ledger/doge/address.ts

@@ -16,7 +16,10 @@ export const getAddress = async (
   walletIndex: number
 ): Promise<E.Either<LedgerError, WalletAddress>> => {
   try {
-    const app = new AppBTC(transport)
+    // Value of `currency` -> `GetAddressOptions` -> `currency` -> `id`
+    // Example https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledger-live-common/src/families/bitcoin/hw-getAddress.ts#L17
+    // DOGE -> `dogecoin` https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledgerjs/packages/cryptoassets/src/currencies.ts#L834
+    const app = new AppBTC({ transport, currency: 'dogecoin' })
     const clientNetwork = toClientNetwork(network)
     const derivePath = getDerivationPath(walletIndex, clientNetwork)
     const { bitcoinAddress: address } = await app.getWalletPublicKey(derivePath, {
@@ -36,7 +39,10 @@ export const getAddress = async (
 }
 
 export const verifyAddress: VerifyAddressHandler = async ({ transport, network, walletIndex }) => {
-  const app = new AppBTC(transport)
+  // Value of `currency` -> `GetAddressOptions` -> `currency` -> `id`
+  // Example https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledger-live-common/src/families/bitcoin/hw-getAddress.ts#L17
+  // DOGE -> `dogecoin` https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledgerjs/packages/cryptoassets/src/currencies.ts#L834
+  const app = new AppBTC({ transport, currency: 'dogecoin' })
   const clientNetwork = toClientNetwork(network)
   const derivePath = getDerivationPath(walletIndex, clientNetwork)
   const _ = await app.getWalletPublicKey(derivePath, {

src/main/api/ledger/doge/transaction.ts

@@ -47,7 +47,10 @@ export const send = async ({
     // @see https://github.com/xchainjs/xchainjs-lib/blob/d6752ac3d6f17a0fe8f1755fcc6cd190119e4e23/packages/xchain-doge/src/client.ts#L300
     checkFeeBounds({ lower: LOWER_FEE_BOUND, upper: UPPER_FEE_BOUND }, feeRate)
 
-    const app = new AppBTC(transport)
+    // Value of `currency` -> `GetAddressOptions` -> `currency` -> `id`
+    // Example https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledger-live-common/src/families/bitcoin/hw-getAddress.ts#L17
+    // DOGE -> `dogecoin` https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledgerjs/packages/cryptoassets/src/currencies.ts#L834
+    const app = new AppBTC({ transport, currency: 'dogecoin' })
     const clientNetwork = toClientNetwork(network)
     const derivePath = getDerivationPath(walletIndex, clientNetwork)
 
@@ -77,7 +80,7 @@ export const send = async ({
 
     const outputScriptHex = app.serializeTransactionOutputs(newTx).toString('hex')
 
-    const txHex = await app.createPaymentTransactionNew({
+    const txHex = await app.createPaymentTransaction({
       inputs,
       associatedKeysets,
       outputScriptHex,

src/main/api/ledger/litecoin/address.ts

@@ -16,7 +16,10 @@ export const getAddress = async (
   walletIndex: number
 ): Promise<E.Either<LedgerError, WalletAddress>> => {
   try {
-    const app = new AppBTC(transport)
+    // Value of `currency` -> `GetAddressOptions` -> `currency` -> `id`
+    // Example https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledger-live-common/src/families/bitcoin/hw-getAddress.ts#L17
+    // LTC -> `litecoin` https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledgerjs/packages/cryptoassets/src/currencies.ts#L1546
+    const app = new AppBTC({ transport, currency: 'litecoin' })
     const clientNetwork = toClientNetwork(network)
     const derivePath = getDerivationPath(walletIndex, clientNetwork)
     const { bitcoinAddress: ltcAddress } = await app.getWalletPublicKey(derivePath, {
@@ -34,7 +37,10 @@ export const getAddress = async (
 }
 
 export const verifyAddress: VerifyAddressHandler = async ({ transport, network, walletIndex }) => {
-  const app = new AppBTC(transport)
+  // Value of `currency` -> `GetAddressOptions` -> `currency` -> `id`
+  // Example https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledger-live-common/src/families/bitcoin/hw-getAddress.ts#L17
+  // LTC -> `litecoin` https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledgerjs/packages/cryptoassets/src/currencies.ts#L1546
+  const app = new AppBTC({ transport, currency: 'litecoin' })
   const clientNetwork = toClientNetwork(network)
   const derivePath = getDerivationPath(walletIndex, clientNetwork)
   const _ = await app.getWalletPublicKey(derivePath, {

src/main/api/ledger/litecoin/transaction.ts

@@ -48,7 +48,10 @@ export const send = async ({
     // @see https://github.com/xchainjs/xchainjs-lib/blob/21e1f65288b994de8b98cb779550e08c15f96314/packages/xchain-litecoin/src/client.ts#L306
     checkFeeBounds({ lower: LOWER_FEE_BOUND, upper: UPPER_FEE_BOUND }, feeRate)
 
-    const app = new AppBTC(transport)
+    // Value of `currency` -> `GetAddressOptions` -> `currency` -> `id`
+    // Example https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledger-live-common/src/families/bitcoin/hw-getAddress.ts#L17
+    // LTC -> `litecoin` https://github.com/LedgerHQ/ledger-live/blob/37c0771329dd5a40dfe3430101bbfb100330f6bd/libs/ledgerjs/packages/cryptoassets/src/currencies.ts#L1546
+    const app = new AppBTC({ transport, currency: 'litecoin' })
     const clientNetwork = toClientNetwork(network)
     const derivePath = getDerivationPath(walletIndex, clientNetwork)
 
@@ -79,7 +82,7 @@ export const send = async ({
 
     const outputScriptHex = app.serializeTransactionOutputs(newTx).toString('hex')
 
-    const txHex = await app.createPaymentTransactionNew({
+    const txHex = await app.createPaymentTransaction({
       inputs,
       associatedKeysets,
       outputScriptHex,

src/renderer/components/pool/PoolTitle.tsx

@@ -9,10 +9,10 @@ import { useNavigate } from 'react-router-dom'
 
 import { Network } from '../../../shared/api/types'
 import { Action as ActionButtonAction, ActionButton } from '../../components/uielements/button/ActionButton'
-import { DEFAULT_WALLET_TYPE } from '../../const'
+// import { DEFAULT_WALLET_TYPE } from '../../const'
 import { loadingString } from '../../helpers/stringHelper'
 import * as poolsRoutes from '../../routes/pools'
-import * as saversRoutes from '../../routes/pools/savers'
+// import * as saversRoutes from '../../routes/pools/savers'
 import { AssetIcon } from '../uielements/assets/assetIcon'
 import * as Styled from './PoolTitle.styles'
 
@@ -90,14 +90,15 @@ export const PoolTitle: React.FC<Props> = ({
         callback: () => {
           navigate(poolsRoutes.deposit.path({ asset: assetToString(asset) }))
         }
-      },
-      {
-        label: intl.formatMessage({ id: 'common.savers' }),
-        disabled: !isAvailablePool || disableAllPoolActions || disableTradingPoolAction,
-        callback: () => {
-          navigate(saversRoutes.earn.path({ asset: assetToString(asset), walletType: DEFAULT_WALLET_TYPE }))
-        }
       }
+      // TODO(@veado) Enable savers
+      // {
+      //   label: intl.formatMessage({ id: 'common.savers' }),
+      //   disabled: !isAvailablePool || disableAllPoolActions || disableTradingPoolAction,
+      //   callback: () => {
+      //     navigate(saversRoutes.earn.path({ asset: assetToString(asset), walletType: DEFAULT_WALLET_TYPE }))
+      //   }
+      // }
     ]
 
     return <ActionButton size={isDesktopView ? 'large' : 'normal'} actions={actions} />

src/renderer/views/pools/ActivePools.tsx

@@ -25,7 +25,7 @@ import { ProtocolLimit, IncentivePendulum } from '../../components/pool'
 import { Action as ActionButtonAction, ActionButton } from '../../components/uielements/button/ActionButton'
 import { PoolsPeriodSelector } from '../../components/uielements/pools/PoolsPeriodSelector'
 import { Table } from '../../components/uielements/table'
-import { DEFAULT_WALLET_TYPE } from '../../const'
+// import { DEFAULT_WALLET_TYPE } from '../../const'
 import { useAppContext } from '../../contexts/AppContext'
 import { useMidgardContext } from '../../contexts/MidgardContext'
 import { ordBaseAmount, ordNumber } from '../../helpers/fp/ord'
@@ -35,7 +35,7 @@ import { usePoolFilter } from '../../hooks/usePoolFilter'
 import { usePoolWatchlist } from '../../hooks/usePoolWatchlist'
 import { useProtocolLimit } from '../../hooks/useProtocolLimit'
 import * as poolsRoutes from '../../routes/pools'
-import * as saversRoutes from '../../routes/pools/savers'
+// import * as saversRoutes from '../../routes/pools/savers'
 import { DEFAULT_NETWORK } from '../../services/const'
 import { PoolsState, DEFAULT_POOL_FILTERS } from '../../services/midgard/types'
 import { GetPoolsPeriodEnum } from '../../types/generated/midgard'
@@ -108,14 +108,15 @@ export const ActivePools: React.FC<PoolsComponentProps> = ({ haltedChains, mimir
           callback: () => {
             navigate(poolsRoutes.deposit.path({ asset: assetToString(asset) }))
           }
-        },
-        {
-          label: intl.formatMessage({ id: 'common.earn' }),
-          disabled: disableAllPoolActions || disableTradingActions,
-          callback: () => {
-            navigate(saversRoutes.earn.path({ asset: assetToString(asset), walletType: DEFAULT_WALLET_TYPE }))
-          }
         }
+        // TODO(@veado) Enable savers
+        // {
+        //   label: intl.formatMessage({ id: 'common.earn' }),
+        //   disabled: disableAllPoolActions || disableTradingActions,
+        //   callback: () => {
+        //     navigate(saversRoutes.earn.path({ asset: assetToString(asset), walletType: DEFAULT_WALLET_TYPE }))
+        //   }
+        // }
       ]
 
       return (