git.iko.soy/bridge
on master help sign in
invites: fix deriving networking keys
commit64fd530657ed1574edd1ebf3150f98dfc45675d1 authoryosoyubik <yosoyubik@gmail.com> dateSun 26 Sep 2021, 08:56 (5 years ago) parent5a2bc24
4 files changed+6−17
compare with master
unifiedsplit
src/components/NetworkingKeys.js+2−1 src/lib/utils/roller.ts+2−14 src/store/lib/useDetailsStore.js+1−1 src/store/lib/useRekeyDateStore.js+1−1
src/components/NetworkingKeys.js+2−1
@@ -97,6 +97,7 @@ export default function NetworkingKeys({ point }) {
9797 details.map(d => d.cryptoSuiteVersion)
9898 )}
9999 </Grid.Item>
100+ {/* TODO: retrieve last rekeydate, if possible? */}
100101 {hasKeys && (
101102 <Grid.Item full as={Flex} row justify="between" className="mt3">
102103 {renderDetail(
@@ -104,7 +105,7 @@ export default function NetworkingKeys({ point }) {
104105 getRekeyDate(point).map(date =>
105106 date.matchWith({
106107 Ok: r => formatDotsWithTime(r.value),
107− Error: () => Nothing(),
108+ Error: () => 'No date available',
108109 })
109110 )
110111 )}
src/lib/utils/roller.ts+2−14
@@ -3,7 +3,7 @@ import { Invite } from 'lib/types/Invite';
33import { Just, Nothing } from 'folktale/maybe';
44import { randomHex } from 'web3-utils';
55import {
6− attemptNetworkSeedDerivation,
6+ deriveNetworkSeedFromUrbitWallet,
77 deriveNetworkKeys,
88 CRYPTO_SUITE_VERSION,
99} from 'lib/keys';
@@ -66,10 +66,6 @@ export const configureKeys = async (
6666 _point: number,
6767 proxy: string,
6868 nonce: number,
69− details: any,
70− authToken: string,
71− authMnemonic: string,
72− wallet: any,
7369 urbitWallet: any
7470) => {
7571 const from = {
@@ -77,15 +73,7 @@ export const configureKeys = async (
7773 proxy,
7874 };
7975
80− const networkSeed = await attemptNetworkSeedDerivation({
81− urbitWallet,
82− wallet,
83− authMnemonic,
84− details,
85− point: _point,
86− authToken,
87− revision: 1,
88− });
76+ const networkSeed = await deriveNetworkSeedFromUrbitWallet(urbitWallet, 1);
8977 // TODO: do something here?
9078 if (Nothing.hasInstance(networkSeed)) {
9179 console.log("Network key Error: couldn't derive network keys");
src/store/lib/useDetailsStore.js+1−1
@@ -10,7 +10,7 @@ const toL1Details = point => {
1010 dominion: 'l2',
1111 active: true,
1212 authenticationKey: point.network.keys.auth,
13− continuityNumber: point.network.keys.rift,
13+ continuityNumber: point.network.rift,
1414 cryptoSuiteVersion: point.network.keys.suite,
1515 encryptionKey: point.network.keys.crypt,
1616 escapeRequested: point.network.escape ? true : false,
src/store/lib/useRekeyDateStore.js+1−1
@@ -33,7 +33,7 @@ export default function useRekeyDateStore() {
3333 if (!_web3 || !_contracts) {
3434 return;
3535 }
36−
36+ //TODO support L2 points
3737 //TODO tighter search?
3838 //TODO maybe move into azimuth-js?
3939 const logs = await _contracts.azimuth.getPastEvents('ChangedKeys', {