64fd530 · bridge · git.iko.soy

src/components/NetworkingKeys.js+2−1

compare with master

unifiedsplit

@@ -97,6 +97,7 @@ export default function NetworkingKeys({ point }) {

97 details.map(d => d.cryptoSuiteVersion)

98 )}

99 </Grid.Item>

100+ {/* TODO: retrieve last rekeydate, if possible? */}

100 {hasKeys && (

101 {hasKeys && (

101 <Grid.Item full as={Flex} row justify="between" className="mt3">

102 <Grid.Item full as={Flex} row justify="between" className="mt3">

102 {renderDetail(

103 {renderDetail(

@@ -104,7 +105,7 @@ export default function NetworkingKeys({ point }) {

104 getRekeyDate(point).map(date =>

105 getRekeyDate(point).map(date =>

105 date.matchWith({

106 date.matchWith({

106 Ok: r => formatDotsWithTime(r.value),

107 Ok: r => formatDotsWithTime(r.value),

107− Error: () => Nothing(),

108+ Error: () => 'No date available',

108 })

109 })

109 )

110 )

110 )}

111 )}

src/lib/utils/roller.ts+2−14

@@ -3,7 +3,7 @@ import { Invite } from 'lib/types/Invite';

3import { Just, Nothing } from 'folktale/maybe';

4import { randomHex } from 'web3-utils';

5import {

6− attemptNetworkSeedDerivation,

6+ deriveNetworkSeedFromUrbitWallet,

7 deriveNetworkKeys,

8 CRYPTO_SUITE_VERSION,

9} from 'lib/keys';

@@ -66,10 +66,6 @@ export const configureKeys = async (

66 _point: number,

67 proxy: string,

68 nonce: number,

69− details: any,

70− authToken: string,

71− authMnemonic: string,

72− wallet: any,

73 urbitWallet: any

69 urbitWallet: any

74) => {

70) => {

75 const from = {

71 const from = {

@@ -77,15 +73,7 @@ export const configureKeys = async (

77 proxy,

73 proxy,

78 };

74 };

79

75

80− const networkSeed = await attemptNetworkSeedDerivation({

76+ const networkSeed = await deriveNetworkSeedFromUrbitWallet(urbitWallet, 1);

81− urbitWallet,

82− wallet,

83− authMnemonic,

84− details,

85− point: _point,

86− authToken,

87− revision: 1,

88− });

89 // TODO: do something here?

77 // TODO: do something here?

90 if (Nothing.hasInstance(networkSeed)) {

78 if (Nothing.hasInstance(networkSeed)) {

91 console.log("Network key Error: couldn't derive network keys");

79 console.log("Network key Error: couldn't derive network keys");

src/store/lib/useDetailsStore.js+1−1

@@ -10,7 +10,7 @@ const toL1Details = point => {

10 dominion: 'l2',

11 active: true,

12 authenticationKey: point.network.keys.auth,

13− continuityNumber: point.network.keys.rift,

13+ continuityNumber: point.network.rift,

14 cryptoSuiteVersion: point.network.keys.suite,

15 encryptionKey: point.network.keys.crypt,

16 escapeRequested: point.network.escape ? true : false,

src/store/lib/useRekeyDateStore.js+1−1

@@ -33,7 +33,7 @@ export default function useRekeyDateStore() {

33 if (!_web3 || !_contracts) {

34 return;

35 }

36−

36+ //TODO support L2 points

37 //TODO tighter search?

38 //TODO maybe move into azimuth-js?

39 const logs = await _contracts.azimuth.getPastEvents('ChangedKeys', {