git.iko.soy/bridge
on master help sign in
fix: clarify language around seed/mnemonic in lib/keys
cf2f7f7Matt Condon (shrugs)
src/lib/keys.js+11−9
compare with master
unifiedsplit
@@ -90,7 +90,10 @@ export const deriveNetworkSeedFromUrbitWallet = async (
90 urbitWallet,
90 urbitWallet,
91 revision = 1
91 revision = 1
92) => {
92) => {
93+ return await deriveNetworkSeedFromMnemonic(
93− return await deriveNetworkSeedFromSeed(urbitWallet.management.seed, revision);
94+ urbitWallet.management.seed,
95+ revision
96+ );
94};
97};
95
98
96/**
99/**
@@ -100,7 +103,7 @@ export const deriveNetworkSeedFromUrbitWallet = async (
100 * @param {number} revision
103 * @param {number} revision
101 * @return {Promise<Maybe<string>>}
104 * @return {Promise<Maybe<string>>}
102 */
105 */
103−export const deriveNetworkSeedFromMnemonic = async (
106+export const deriveNetworkSeedFromManagementMnemonic = async (
104 wallet,
107 wallet,
105 authMnemonic,
108 authMnemonic,
106 details,
109 details,
@@ -108,22 +111,21 @@ export const deriveNetworkSeedFromMnemonic = async (
108) => {
111) => {
109 const isManagementProxy = eqAddr(wallet.address, details.managementProxy);
112 const isManagementProxy = eqAddr(wallet.address, details.managementProxy);
110
113
111− // the network seed is derivable from mnemonic iff the management proxy
114+ // the network seed is derivable iff this mnemonic is the management proxy
112− // is this mnemonic
113 if (isManagementProxy) {
115 if (isManagementProxy) {
114− return await deriveNetworkSeedFromSeed(authMnemonic, revision);
116+ return await deriveNetworkSeedFromMnemonic(authMnemonic, revision);
115 }
117 }
116
118
117 return Nothing();
119 return Nothing();
118};
120};
119
121
120/**
122/**
121− * @param {string} seed
123+ * @param {string} mnemonic
122 * @param {number} revision
124 * @param {number} revision
123 * @return {Promise<Maybe<string>>}
125 * @return {Promise<Maybe<string>>}
124 */
126 */
125−const deriveNetworkSeedFromSeed = async (seed, revision) => {
127+const deriveNetworkSeedFromMnemonic = async (mnemonic, revision) => {
126− return Just(await kg.deriveNetworkSeed(seed, '', revision));
128+ return Just(await kg.deriveNetworkSeed(mnemonic, '', revision));
127};
129};
128
130
129/**
131/**
@@ -141,7 +143,7 @@ export const attemptNetworkSeedDerivation = async ({
141 }
143 }
142
144
143 if (Just.hasInstance(wallet) && Just.hasInstance(authMnemonic)) {
145 if (Just.hasInstance(wallet) && Just.hasInstance(authMnemonic)) {
144− return await deriveNetworkSeedFromMnemonic(
146+ return await deriveNetworkSeedFromManagementMnemonic(
145 wallet.value,
147 wallet.value,
146 authMnemonic.value,
148 authMnemonic.value,
147 details,
149 details,