fix bug in absolute derivation path assembly for scheme V2 with mnemonic

vacuumlabs · Dec 21, 2018 · 8029b38 · 8029b38
1 parent 4ad34c0
commit 8029b38
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/app/frontend/wallet/helpers/mnemonicOrHdNodeStringToWalletSecret.js b/app/frontend/wallet/helpers/mnemonicOrHdNodeStringToWalletSecret.js
@@ -1,4 +1,4 @@
-const {decodePaperWalletMnemonic, walletSecretFromMnemonic} = require('cardano-crypto.js')
+const {decodePaperWalletMnemonic, mnemonicToRootKeypair} = require('cardano-crypto.js')
 
 const {isMnemonicInPaperWalletFormat} = require('../mnemonic')
 const {validateMnemonic} = require('../mnemonic')
@@ -13,7 +13,7 @@ const mnemonicToWalletSecret = async (mnemonic, derivationScheme) => {
     mnemonic = await decodePaperWalletMnemonic(mnemonic)
   }
 
-  return walletSecretFromMnemonic(mnemonic, derivationScheme.number)
+  return mnemonicToRootKeypair(mnemonic, derivationScheme.number)
 }
 
 const mnemonicOrHdNodeStringToWalletSecret = async (

diff --git a/app/package.json b/app/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "bip39-light": "^1.0.7",
     "borc": "^2.0.4",
-    "cardano-crypto.js": "^4.2.3",
+    "cardano-crypto.js": "^5.0.0",
     "file-saver": "^1.3.8",
     "preact": "^8.2.7",
     "trezor-connect": "^6.0.0",

diff --git a/app/tests/src/address-manager.js b/app/tests/src/address-manager.js
@@ -112,16 +112,16 @@ describe('wallet addresses derivation scheme V1', () => {
 
 describe('wallet addresses derivation scheme V2', () => {
   const expectedWalletAddresses = [
-    'Ae2tdPwUPEYzQAvoUDaw3kghu19zJcpZrxY5m2wKz2uQuaCXs8ea9EBAAFQ',
-    'Ae2tdPwUPEZHWwSaKPwi4JkDeijLQM93wgbfbmsA7ssGZLQ3Uh1unvABAKR',
-    'Ae2tdPwUPEZLeySAx2yxc1eXpdahTqR1fLp8XcVLAHLfHFpukMw7MDt7UyY',
-    'Ae2tdPwUPEZDV8rMvDE2hzXT984xEKE332zjiCgFuKAWiiXm7uGpuXoqJ2s',
-    'Ae2tdPwUPEZ7uybwGEgjtZ1dDVQAxBsFwaKJkKygzJvoep7kDwfSv3cE9K3',
-    'Ae2tdPwUPEZ9gop4Vtwe7x3dAxNcUQbzcvqzimnBuXWQLPFrVrL5okViSaW',
-    'Ae2tdPwUPEZ6uA8r8SaVzYyrXWC9bfywpvFFmXebycm8vB5F3SPWh6k66K8',
-    'Ae2tdPwUPEZGd4zAPiZycUr4txd1r4ercSyRa9WniDJtgv6BbUmpdf8sGiP',
-    'Ae2tdPwUPEZMgMJSVKf9TLPBfLd1hDBABfLtMhB5KamqVLS4VHmgZgJEjp5',
-    'Ae2tdPwUPEZ9dqx9Zoo3nMxmzFz4WCz4wWJSxwRG4QmFjZ7oWYSfvGJfc4R',
+    'Ae2tdPwUPEZ6RUCnjGHFqi59k5WZLiv3HoCCNGCW8SYc5H9srdTzn1bec4W',
+    'Ae2tdPwUPEZ7dnds6ZyhQdmgkrDFFPSDh8jG9RAhswcXt1bRauNw5jczjpV',
+    'Ae2tdPwUPEZ8LAVy21zj4BF97iWxKCmPv12W6a18zLX3V7rZDFFVgqUBkKw',
+    'Ae2tdPwUPEZ7Ed1V5G9oBoRoK3sbgFU8b9iZY2kegf4s6228EwVLRSq9NzP',
+    'Ae2tdPwUPEYyLw6UJRKnbbudG8PJR7KfPhioRW8m1BohkFAqR44pPg6BYVZ',
+    'Ae2tdPwUPEYw9wMWUnyutGYXdpVqNStf4g3TAxiAYMyACQAWXNFvs3fZ8do',
+    'Ae2tdPwUPEZ9wMYpKKXJLAEa5JV2CKBoiFvKfuqdtDLMARkaZG9P4K7ZRjX',
+    'Ae2tdPwUPEZHAZxwzS7MrSS8nc6DXt4Nj8FvrYHXCVDkzVEjrAfVxxZEL4H',
+    'Ae2tdPwUPEYz8hGBRWCNJFm2bDuSHBbphMT32wPxALXTVPWrRCtZhSPbRen',
+    'Ae2tdPwUPEZHxx6ug6oyXREcwQ1tjBY4D2B6M7rYL9LhbAXfRPfMtm3nV4J',
   ]
 
   it('should derive the right sequence of addresses from the root secret key', async () => {

diff --git a/app/yarn.lock b/app/yarn.lock
@@ -1347,10 +1347,10 @@ camelcase@^4.1.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
-cardano-crypto.js@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/cardano-crypto.js/-/cardano-crypto.js-4.2.3.tgz#b0ef4ae4cd0bf84b6a948d82a4fe4c75ee779b9c"
-  integrity sha512-CQqdpBZnQEdSu8+vvBYOSOTfQ4MerhH7KRl/BqDqEMG3cc3LgCwSMmSnQxSD9VRZKAUnvqEtMll5lvwYeu9bTw==
+cardano-crypto.js@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cardano-crypto.js/-/cardano-crypto.js-5.0.0.tgz#cfeae89a0c0dd1fefb1b854f2d2e268d0837b280"
+  integrity sha512-OT1RSwgGzedxtm6f6yAQF0NagC6BYwXeNyhfcsZfEQtdxyHS1kduM7U4+x3+WDVFen71/Zi9fFp23sOFkwQUig==
   dependencies:
     bip39-light "^1.0.7"
     borc "^2.0.4"