Merge branch 'develop' into feature/ddw-409-new-mnemonic-input

Author: przemyslaw-wlodek

CHANGELOG.md

@@ -13,6 +13,7 @@
 
 ### Chores
 
+- Fix `darwin-launcher.go` to replace its process image with `cardano-launcher` (binary), and not swallow `stdout` ([PR 3023](https://github.com/input-output-hk/daedalus/pull/3023))
 - Updated cardano-node to 1.35.1 ([PR 3012](https://github.com/input-output-hk/daedalus/pull/3012))
 
 ### Features

nix/darwin-launcher.go

@@ -5,9 +5,12 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"syscall"
 )
 
 func main() {
+	fmt.Fprintf(os.Stderr, "darwin-launcher: PID = %d\n", os.Getpid())
+
 	ex, err := os.Executable()
 	if err != nil {
 		panic(err)
@@ -17,14 +20,23 @@ func main() {
 
 	os.Setenv("PATH", fmt.Sprintf("%s:%s", installDir, os.Getenv("PATH")))
 
-	launcherConfig := filepath.Join(installDir, "../Resources/launcher-config.yaml")
-	helper := filepath.Join(installDir, "../Resources/helper")
-
+	launcherConfigPath := filepath.Join(installDir, "../Resources/launcher-config.yaml")
+	helperPath := filepath.Join(installDir, "../Resources/helper")
 
-	if err = exec.Command(helper).Run(); err != nil {
+	helperCmd := exec.Command(helperPath)
+	helperCmd.Stdout = os.Stdout
+	helperCmd.Stderr = os.Stderr
+	if err := helperCmd.Run(); err != nil {
 		panic(err)
 	}
-	if err = exec.Command("cardano-launcher", "--config", launcherConfig).Run(); err != nil {
-		panic(err)
+
+	// Replace the current process (otherwise WDIO complains in end-to-end tests):
+	img := filepath.Join(installDir, "cardano-launcher")
+	argv := []string{"cardano-launcher", "--config", launcherConfigPath}
+	env := os.Environ()
+	if err := syscall.Exec(img, argv, env); err != nil {
+		fmt.Println(err)
 	}
+
+	fmt.Fprintf(os.Stderr, "this won’t happen\n")
 }

source/renderer/app/api/api.ts

@@ -228,6 +228,7 @@ import { getAssets } from './assets/requests/getAssets';
 import { getAccountPublicKey } from './wallets/requests/getAccountPublicKey';
 import { doesWalletRequireAdaToRemainToSupportTokens } from './utils/apiHelpers';
 import { AssetLocalData } from '../types/localDataTypes';
+import { handleNotEnoughMoneyError } from './errors';
 
 export default class AdaApi {
   config: RequestConfig;
@@ -1061,51 +1062,14 @@ export default class AdaApi {
         minimumAda,
       };
     } catch (error) {
-      let notEnoughMoneyError;
-
-      if (walletBalance.gt(availableBalance)) {
-        // 1. Amount exceeds availableBalance due to pending transactions:
-        // - walletBalance > availableBalance
-        // = show "Cannot calculate fees while there are pending transactions."
-        notEnoughMoneyError = 'canNotCalculateTransactionFees';
-      } else if (
-        !walletBalance.isZero() &&
-        walletBalance.isEqualTo(rewardsBalance)
-      ) {
-        // 2. Wallet contains only rewards:
-        // - walletBalance === rewardsBalance
-        // = show "Cannot send from a wallet that contains only rewards balances."
-        notEnoughMoneyError = 'inputsDepleted';
-      } else {
-        // 3. Amount exceeds walletBalance:
-        // - walletBalance === availableBalance
-        // = show "Not enough Ada. Try sending a smaller amount."
-        notEnoughMoneyError = 'notEnoughFundsForTransaction';
-      }
-
-      // ApiError with logging showcase
-      throw new ApiError(error, {
-        // @ts-ignore ts-migrate(2322) FIXME: Type 'boolean' is not assignable to type 'Record<s... Remove this comment to see the full error message
-        logError: true,
-        msg: 'AdaApi::calculateTransactionFee error',
-      })
-        .set(notEnoughMoneyError, true)
-        .where('code', 'not_enough_money')
-        .set('utxoTooSmall', true, {
-          // @ts-ignore ts-migrate(2339) FIXME: Property 'exec' does not exist on type '{}'.
-          minimumAda: get(
-            /(Expected min coin value: +)([0-9]+.[0-9]+)/.exec(error.message),
-            2,
-            0
-          ),
-        })
-        .where('code', 'utxo_too_small')
-        .set('invalidAddress')
-        .where('code', 'bad_request')
-        .inc('message', 'Unable to decode Address')
-        .result();
+      handleNotEnoughMoneyError(error, {
+        walletBalance,
+        availableBalance,
+        rewardsBalance,
+      });
     }
   };
+
   selectCoins = async (request: {
     walletId: string;
     walletBalance: BigNumber;
@@ -1270,48 +1234,12 @@ export default class AdaApi {
       logger.error('AdaApi::selectCoins error', {
         error,
       });
-      let notEnoughMoneyError;
 
-      if (walletBalance.gt(availableBalance)) {
-        // 1. Amount exceeds availableBalance due to pending transactions:
-        // - walletBalance > availableBalance
-        // = show "Cannot calculate fees while there are pending transactions."
-        notEnoughMoneyError = 'canNotCalculateTransactionFees';
-      } else if (
-        !walletBalance.isZero() &&
-        walletBalance.isEqualTo(rewardsBalance)
-      ) {
-        // 2. Wallet contains only rewards:
-        // - walletBalance === rewardsBalance
-        // = show "Cannot send from a wallet that contains only rewards balances."
-        notEnoughMoneyError = 'inputsDepleted';
-      } else {
-        // 3. Amount exceeds walletBalance:
-        // - walletBalance === availableBalance
-        // = show "Not enough Ada. Try sending a smaller amount."
-        notEnoughMoneyError = 'notEnoughFundsForTransaction';
-      }
-
-      // ApiError with logging showcase
-      throw new ApiError(error, {
-        // @ts-ignore ts-migrate(2322) FIXME: Type 'boolean' is not assignable to type 'Record<s... Remove this comment to see the full error message
-        logError: true,
-        msg: 'AdaApi::calculateTransactionFee error',
-      })
-        .set(notEnoughMoneyError, true)
-        .where('code', 'not_enough_money')
-        .set('utxoTooSmall', true, {
-          minimumAda: get(
-            /(Expected min coin value: +)([0-9]+.[0-9]+)/.exec(error.message),
-            2,
-            0
-          ),
-        })
-        .where('code', 'utxo_too_small')
-        .set('invalidAddress')
-        .where('code', 'bad_request')
-        .inc('message', 'Unable to decode Address')
-        .result();
+      handleNotEnoughMoneyError(error, {
+        walletBalance,
+        availableBalance,
+        rewardsBalance,
+      });
     }
   };
   createExternalTransaction = async (

source/renderer/app/api/errors.ts

@@ -1,4 +1,7 @@
+import BigNumber from 'bignumber.js';
+import get from 'lodash/get';
 import { defineMessages } from 'react-intl';
+import ApiError, { ErrorType } from '../domains/ApiError';
 
 export const messages = defineMessages({
   // common
@@ -119,3 +122,60 @@ export const messages = defineMessages({
       '"Balance after transaction would not leave enough ada in the wallet to support tokens remaining in wallet',
   },
 });
+
+type Balances = {
+  walletBalance: BigNumber;
+  availableBalance: BigNumber;
+  rewardsBalance: BigNumber;
+};
+
+export const handleNotEnoughMoneyError = (
+  error: ErrorType,
+  balance: Balances
+) => {
+  let notEnoughMoneyError;
+
+  const { walletBalance, availableBalance, rewardsBalance } = balance;
+
+  if (walletBalance.gt(availableBalance)) {
+    // 1. Amount exceeds availableBalance due to pending transactions:
+    // - walletBalance > availableBalance
+    // = show "Cannot calculate fees while there are pending transactions."
+    notEnoughMoneyError = 'canNotCalculateTransactionFees';
+  } else if (
+    !walletBalance.isZero() &&
+    walletBalance.isEqualTo(rewardsBalance)
+  ) {
+    // 2. Wallet contains only rewards:
+    // - walletBalance === rewardsBalance
+    // = show "Cannot send from a wallet that contains only rewards balances."
+    notEnoughMoneyError = 'inputsDepleted';
+  } else {
+    // 3. Amount exceeds walletBalance:
+    // - walletBalance === availableBalance
+    // = show "Not enough Ada. Try sending a smaller amount."
+    notEnoughMoneyError = 'notEnoughFundsForTransaction';
+  }
+
+  // ApiError with logging showcase
+  throw new ApiError(error, {
+    // @ts-ignore ts-migrate(2322) FIXME: Type 'boolean' is not assignable to type 'Record<s... Remove this comment to see the full error message
+    logError: true,
+    msg: 'AdaApi::calculateTransactionFee error',
+  })
+    .set(notEnoughMoneyError, true)
+    .where('code', 'not_enough_money')
+    .set('utxoTooSmall', true, {
+      // @ts-ignore ts-migrate(2339) FIXME: Property 'exec' does not exist on type '{}'.
+      minimumAda: get(
+        /(Expected min coin value: +)([0-9]+.[0-9]+)/.exec(error.message),
+        2,
+        0
+      ),
+    })
+    .where('code', 'utxo_too_small')
+    .set('invalidAddress')
+    .where('code', 'bad_request')
+    .inc('message', 'Unable to decode Address')
+    .result();
+};