Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

[CO-367] Fixing esk of addresses in mkSigner #3661

Merged
merged 1 commit into from
Sep 25, 2018
Merged

[CO-367] Fixing esk of addresses in mkSigner #3661

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions wallet-new/src/Cardano/Wallet/Kernel/Transactions.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,9 +464,12 @@ mkSigner spendingPassword (Just esk) snapshot addr =
esk
accountIndex
addressIndex
-- eks address fix - we need to use the esk as returned
Copy link
Contributor

@adinapoli-iohk adinapoli-iohk Sep 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor typo, that's esk. I would omit the "esk address fix" part completely, We can just say "we need to use the ESK..." exactly as you are doing now.

-- from Core.deriveLvl2KeyPair rather than rely on the
-- one from encrypted secret key delivered to mkSigner
in case res of
Just (a, _) | a == addr ->
Right (SafeSigner esk spendingPassword)
Just (a, eskAddr) | a == addr ->
Right (SafeSigner eskAddr spendingPassword)
_otherwise ->
Left (SignTransactionErrorNotOwned addr)

Expand Down Expand Up @@ -589,5 +592,3 @@ redeemAda w@ActiveWallet{..} accId pw rsk = runExceptT $ do
isOutput (inp, TxOutAux (TxOut addr coin)) = do
guard $ addr == redeemAddr
return (inp, coin)