Skip to content

Commit

Permalink
Merge remote-tracking branch 'daedalus-clone/release/2.0.1' into fix/…
Browse files Browse the repository at this point in the history
…ddw-343-stake-pool-search-performance
  • Loading branch information
darko-mijic committed Aug 4, 2020
2 parents f192990 + 1d88037 commit c4208b0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
5 changes: 3 additions & 2 deletions release-build.nix
Expand Up @@ -4,9 +4,10 @@

let
mkWindows = cluster: (import ./. { inherit cluster buildNum; target = "x86_64-windows"; HSMServer = "HSM"; }).windows-installer;
mkLinux = cluster: (import ./release.nix { inherit buildNum;}).${cluster}.installer.x86_64-linux;
mkLinux = cluster: (import ./. { inherit cluster buildNum;}).wrappedBundle;
pkgs = (import ./. {}).pkgs;
in pkgs.runCommand "signed-release" {} ''
mkdir $out
cp -v ${mkWindows "shelley_testnet_v6"}/*exe $out/
cp -v ${mkLinux "mainnet"}/*bin $out/
cp -v ${mkWindows "mainnet"}/*exe $out/
''
1 change: 0 additions & 1 deletion source/renderer/app/api/api.js
Expand Up @@ -633,7 +633,6 @@ export default class AdaApi {
},
],
passphrase,
withdrawal: TransactionWithdrawal,
};

let response: Transaction;
Expand Down
2 changes: 0 additions & 2 deletions source/renderer/app/api/transactions/types.js
Expand Up @@ -123,7 +123,6 @@ export type TransactionParams = {
data: {
payments: Array<TransactionPaymentData>,
passphrase: string,
withdrawal: TransactionWithdrawalType,
},
};

Expand All @@ -136,7 +135,6 @@ export type GetTransactionFeeParams = {
walletId: string,
data: {
payments: Array<TransactionPaymentData>,
withdrawal: TransactionWithdrawalType,
},
};

Expand Down

0 comments on commit c4208b0

Please sign in to comment.