6b4ca23 · bridge · git.iko.soy

git.iko.soy/bridge

Account for the passphrase when doing network seed derivation

commit6b4ca2359ef253479c2344f60b762411be6ad392 authorFang <git@fang.io> dateThu 18 Jul 2019, 15:06 (7 years ago) parentdffcebf

2 files changed+13−3

compare with master

unifiedsplit

src/lib/keys.js+12−3 src/lib/wallet.js+1

src/lib/keys.js+12−3

@@ -92,6 +92,7 @@ export const deriveNetworkSeedFromUrbitWallet = async (

9292) => {

9393 return await deriveNetworkSeedFromMnemonic(

9494 urbitWallet.management.seed,

95+ urbitWallet.meta.passphrase,

9596 revision

9697 );

9798};

@@ -113,7 +114,11 @@ export const deriveNetworkSeedFromManagementMnemonic = async (

113114

114115 // the network seed is derivable iff this mnemonic is the management proxy

115116 if (isManagementProxy) {

116− return await deriveNetworkSeedFromMnemonic(authMnemonic, revision);

117+ return await deriveNetworkSeedFromMnemonic(

118+ authMnemonic,

119+ wallet.passphrase,

120+ revision

121+ );

117122 }

118123

119124 return Nothing();

@@ -124,8 +129,12 @@ export const deriveNetworkSeedFromManagementMnemonic = async (

124129 * @param {number} revision

125130 * @return {Promise<Maybe<string>>}

126131 */

127−const deriveNetworkSeedFromMnemonic = async (mnemonic, revision) => {

128− return Just(await kg.deriveNetworkSeed(mnemonic, '', revision));

132+const deriveNetworkSeedFromMnemonic = async (

133+ mnemonic,

134+ passphrase,

135+ revision

136+) => {

137+ return Just(await kg.deriveNetworkSeed(mnemonic, passphrase, revision));

129138};

130139

131140/**

src/lib/wallet.js+1

@@ -90,6 +90,7 @@ export const walletFromMnemonic = (mnemonic, hdpath, passphrase) => {

9090 const hd = bip32.fromSeed(sd);

9191 wal = hd.derivePath(path);

9292 wal.address = addressFromSecp256k1Public(wal.publicKey);

93+ wal.passphrase = passphrase || '';

9394 wal = Just(wal);

9495 } catch (_) {

9596 wal = Nothing();