git.iko.soy/bridge
on master help sign in
rekey: new breach/simple rekey copy
9cccfa8James Acklin
src/views/UrbitOS/NetworkKeys.scss+10−10
compare with master
unifiedsplit
@@ -6,6 +6,12 @@
6 .body-pane {
6 .body-pane {
7 height: 360px;
7 height: 360px;
8
8
9+ .download {
10+ height: 24px;
11+ width: 24px;
12+ margin: 0 auto 22px;
13+ }
14+
9 .download-message {
15 .download-message {
10 align-items: center;
16 align-items: center;
11 width: 350px;
17 width: 350px;
@@ -15,12 +21,6 @@
15 letter-spacing: 0em;
21 letter-spacing: 0em;
16 text-align: center;
22 text-align: center;
17 margin: 90px auto 40px;
23 margin: 90px auto 40px;
18−
19− .download {
20− height: 24px;
21− width: 24px;
22− margin-bottom: 22px;
23− }
24 }
24 }
25
25
26 .contents {
26 .contents {
@@ -29,24 +29,24 @@
29 display: flex;
29 display: flex;
30 flex-direction: column;
30 flex-direction: column;
31 justify-content: space-between;
31 justify-content: space-between;
32−
32+
33 .check-row {
33 .check-row {
34 margin-top: 8px;
34 margin-top: 8px;
35 font-weight: 500;
35 font-weight: 500;
36−
36+
37 .checkbox {
37 .checkbox {
38 border-radius: $medium-border-radius;
38 border-radius: $medium-border-radius;
39 height: 16px;
39 height: 16px;
40 width: 16px;
40 width: 16px;
41 margin-right: 14px;
41 margin-right: 14px;
42−
42+
43 svg {
43 svg {
44 height: 18px;
44 height: 18px;
45 width: 18px;
45 width: 18px;
46 }
46 }
47 }
47 }
48 }
48 }
49−
49+
50 .info-text {
50 .info-text {
51 color: $dark-gray;
51 color: $dark-gray;
52 margin: 8px 0px 24px 32px;
52 margin: 8px 0px 24px 32px;
src/views/UrbitOS/NetworkKeys.tsx+43−6
@@ -9,7 +9,7 @@ import { Just } from 'folktale/maybe';
9import { Grid, Button } from 'indigo-react';
9import { Grid, Button } from 'indigo-react';
10import * as azimuth from 'azimuth-js';
10import * as azimuth from 'azimuth-js';
11import { randomHex } from 'web3-utils';
11import { randomHex } from 'web3-utils';
12−import { Box, Checkbox, Icon, Row } from '@tlon/indigo-react';
12+import { Box, Checkbox, Icon, Row, Text } from '@tlon/indigo-react';
13
13
14import { usePointCache } from 'store/pointCache';
14import { usePointCache } from 'store/pointCache';
15import { useNetwork } from 'store/network';
15import { useNetwork } from 'store/network';
@@ -280,8 +280,44 @@ export default function UrbitOSNetworkKeys({
280 ? 'Set Network Keys'
280 ? 'Set Network Keys'
281 : 'Initiate Network Keys';
281 : 'Initiate Network Keys';
282
282
283− const usageMessage =
283+ const bootMessage = () => (
284+ <Text as="p" textAlign={'center'}>
284− 'With your new network keys, you also have a new keyfile. Download your new keyfile to boot your OS.';
285+ With your new network keys, you also have a new bootkey. Download your new
286+ bootkey to boot your ship. Be sure to delete your old pier before booting
287+ with this new bootkey.
288+ </Text>
289+ );
290+
291+ const resetMessage = () => (
292+ <>
293+ <Text as="p" textAlign={'center'}>
294+ With your new network keys, you also have a new bootkey.
295+ <br />
296+ Copy the contents of your new bootkey and run
297+ </Text>
298+ <Text
299+ as="code"
300+ mono
301+ bg={'washedGray'}
302+ padding={2}
303+ borderRadius={2}
304+ textAlign={'center'}>
305+ |rekey 'bootkey_contents'
306+ </Text>
307+ <Text as="p" textAlign={'center'}>
308+ using the dojo on your running ship.
309+ </Text>
310+ </>
311+ );
312+
313+ const waitMessage = () => (
314+ <Text as="p" textAlign={'center'}>
315+ <strong>Important:</strong> you will need to wait until the next L2 batch
316+ is submitted to the roller to boot your ship. If you do not wait, then you
317+ will run into a key mismatch error and will not be able to communicate
318+ with other ships on the network.
319+ </Text>
320+ );
285
321
286 const buttonText = `${hasKeys ? 'Reset' : 'Set'} Network Keys`;
322 const buttonText = `${hasKeys ? 'Reset' : 'Set'} Network Keys`;
287
323
@@ -295,9 +331,10 @@ export default function UrbitOSNetworkKeys({
295 <BodyPane>
331 <BodyPane>
296 {isComplete && (
332 {isComplete && (
297 <Box className="flex-col col justify-between h-full">
333 <Box className="flex-col col justify-between h-full">
298− <Box className="flex-col download-message">
334+ <Box className="flex-col h-full justify-center">
299 <Icon icon="Download" className="download" />
335 <Icon icon="Download" className="download" />
300− <Box>{usageMessage}</Box>
336+ {breach ? bootMessage() : resetMessage()}
337+ {breach && point.isL2 ? waitMessage() : null}
301 </Box>
338 </Box>
302 {point.isL2 ? (
339 {point.isL2 ? (
303 <Grid.Item
340 <Grid.Item
@@ -306,7 +343,7 @@ export default function UrbitOSNetworkKeys({
306 solid
343 solid
307 center
344 center
308 onClick={keyfileBind.download}>
345 onClick={keyfileBind.download}>
309− Download Keyfile
346+ Download Bootkey
310 </Grid.Item>
347 </Grid.Item>
311 ) : (
348 ) : (
312 <Grid.Item
349 <Grid.Item