git.iko.soy/bridge
on master help sign in
fix: remove unecessary Maybe for deriveNetworkSeed fns
a3d5a70Matt Condon (shrugs)
src/lib/invite.js+1−1
compare with master
unifiedsplit
@@ -122,7 +122,7 @@ export async function reticketPointBetweenWallets({
122
122
123 // configure networking public keys
123 // configure networking public keys
124 const seed = await deriveNetworkSeedFromUrbitWallet(
124 const seed = await deriveNetworkSeedFromUrbitWallet(
125− Just(toWallet),
125+ toWallet,
126 INITIAL_NETWORK_KEY_REVISION
126 INITIAL_NETWORK_KEY_REVISION
127 );
127 );
128
128
src/lib/keys.js+7−10
@@ -77,7 +77,7 @@ export const compileNetworkingKey = (pair, point, revision) => {
77};
77};
78
78
79/**
79/**
80− * @param {Maybe<any>} urbitWallet
80+ * @param {object} urbitWallet
81 * @param {number} revision
81 * @param {number} revision
82 * @return {Promise<Maybe<string>>}
82 * @return {Promise<Maybe<string>>}
83 */
83 */
@@ -85,8 +85,7 @@ export const deriveNetworkSeedFromUrbitWallet = async (
85 urbitWallet,
85 urbitWallet,
86 revision = 1
86 revision = 1
87) => {
87) => {
88− const _urbitWallet = need.wallet(urbitWallet);
89− return deriveNetworkSeedFromSeed(_urbitWallet.management.seed, revision);
88+ return deriveNetworkSeedFromSeed(urbitWallet.management.seed, revision);
90};
89};
91
90
92/**
91/**
@@ -102,12 +101,10 @@ export const deriveNetworkSeedFromMnemonic = async (
102 details,
101 details,
103 revision = 1
102 revision = 1
104) => {
103) => {
105− const _wallet = need.wallet(wallet);
106− const _mnemonic = need.authMnemonic(authMnemonic);
107− const isManagementProxy = eqAddr(_wallet.address, details.managementProxy);
104+ const isManagementProxy = eqAddr(wallet.address, details.managementProxy);
108
105
109 if (isManagementProxy) {
106 if (isManagementProxy) {
110− return await deriveNetworkSeedFromSeed(_mnemonic, revision);
107+ return await deriveNetworkSeedFromSeed(authMnemonic, revision);
111 }
108 }
112
109
113 return Nothing();
110 return Nothing();
@@ -136,13 +133,13 @@ export const attemptNetworkSeedDerivation = async ({
136 revision,
133 revision,
137}) => {
134}) => {
138 if (Just.hasInstance(urbitWallet)) {
135 if (Just.hasInstance(urbitWallet)) {
139− return await deriveNetworkSeedFromUrbitWallet(urbitWallet, revision);
136+ return await deriveNetworkSeedFromUrbitWallet(urbitWallet.value, revision);
140 }
137 }
141
138
142 if (Just.hasInstance(wallet) && Just.hasInstance(authMnemonic)) {
139 if (Just.hasInstance(wallet) && Just.hasInstance(authMnemonic)) {
143 return await deriveNetworkSeedFromMnemonic(
140 return await deriveNetworkSeedFromMnemonic(
144− wallet,
141+ wallet.value,
145− authMnemonic,
142+ authMnemonic.value,
146 details,
143 details,
147 revision
144 revision
148 );
145 );