git.iko.soy/bridge
on master help sign in
Merge pull request #937 from urbit/t/895-keygen
11f9916tomholford
src/components/DownloadKeyfileButton.js+1−1
compare with master
unifiedsplit
@@ -4,7 +4,7 @@ import { B } from 'indigo-react';
4import { DownloadButton } from 'components/Buttons';
4import { DownloadButton } from 'components/Buttons';
5
5
6export default function DownloadKeyfileButton({
6export default function DownloadKeyfileButton({
7− // useMultikeyFileGenerator.bind
7+ // useKeyfileGenerator.bind
8 generating,
8 generating,
9 available,
9 available,
10 downloaded,
10 downloaded,
src/lib/useKeyfileGenerator.ts+168−51
@@ -1,49 +1,66 @@
1import { useCallback, useMemo, useEffect, useState } from 'react';
1import { useCallback, useMemo, useEffect, useState } from 'react';
2−import { Just, Nothing } from 'folktale/maybe';
2+import { Just } from 'folktale/maybe';
3import saveAs from 'file-saver';
3import saveAs from 'file-saver';
4−
5import { useWallet } from 'store/wallet';
4import { useWallet } from 'store/wallet';
6−import { useRollerStore } from 'store/rollerStore';
5+import { EMPTY_POINT, useRollerStore } from 'store/rollerStore';
7−
8import { generateCode } from 'lib/networkCode';
6import { generateCode } from 'lib/networkCode';
9−
10import {
7import {
11 attemptNetworkSeedDerivation,
8 attemptNetworkSeedDerivation,
9+ deriveNetworkSeedFromUrbitWallet,
12 keysMatchChain,
10 keysMatchChain,
13 deriveNetworkKeys,
11 deriveNetworkKeys,
14− compileNetworkKey,
12+ compileMultiKey,
15} from './keys';
13} from './keys';
16import { stripSigPrefix } from 'form/formatters';
14import { stripSigPrefix } from 'form/formatters';
15+import useRoller from './useRoller';
16+import Point from './types/Point';
17+import { toL1Details } from './utils/point';
18+import { ETH_ZERO_ADDR } from './constants';
17
19
18−// overrideable defaults:
19−// seed - derived from wallet, mnemonic, or token (if posisble)
20−// point - the current pointCursor
21interface useKeyfileGeneratorArgs {
20interface useKeyfileGeneratorArgs {
21+ point?: Point;
22− seed?: string;
22+ seeds: string[];
23− point?: number;
24}
23}
25
24
26/**
25/**
27− * @deprecated
26+ * The default Keyfile Generator. Can be used by itself, or composed with
28− * Use `useMultikeyFileGenerator` instead
27+ * other hooks (see `useActivationKeyfileGenerator` and
28+ * `useSingleKeyfileGenerator`).
29+ *
30+ * @param point Point - (optional) the Point for which to generate keys
31+ * @param seeds string[] - (required) one or more seeds consumed by deriveNetworkKeys
32+ *
29 */
33 */
30−export default function useKeyfileGenerator({ seed }: useKeyfileGeneratorArgs) {
34+function useKeyfileGenerator({ point, seeds }: useKeyfileGeneratorArgs) {
31− const { urbitWallet, wallet, authMnemonic, authToken }: any = useWallet();
35+ // exported keyfile generator properties
32− const { point } = useRollerStore();
33−
34 const [notice, setNotice] = useState('Deriving networking keys...');
36 const [notice, setNotice] = useState('Deriving networking keys...');
35 const [downloaded, setDownloaded] = useState(false);
37 const [downloaded, setDownloaded] = useState(false);
36 const [generating, setGenerating] = useState(true);
38 const [generating, setGenerating] = useState(true);
37 const [keyfile, setKeyfile] = useState<boolean | string>(false);
39 const [keyfile, setKeyfile] = useState<boolean | string>(false);
38 const [code, setCode] = useState(false);
40 const [code, setCode] = useState(false);
39
41
42+ // resolved point
43+ const { point: storedPoint } = useRollerStore();
44+ const resolvedPoint = useMemo(() => {
45+ return point || storedPoint;
46+ }, [point, storedPoint]);
47+
40− const networkRevision = Number(point.keyRevisionNumber);
48+ const networkRevision = useMemo(() => {
49+ return Number(resolvedPoint.keyRevisionNumber);
50+ }, [resolvedPoint]);
51+ const canManage = useMemo(() => {
41− const canManage = point.isOwner || point.isManagementProxy;
52+ return resolvedPoint.isOwner || resolvedPoint.isManagementProxy;
53+ }, [resolvedPoint]);
42
54
43 const hasNetworkKeys = networkRevision > 0;
55 const hasNetworkKeys = networkRevision > 0;
44 const available = canManage && hasNetworkKeys && !!keyfile;
56 const available = canManage && hasNetworkKeys && !!keyfile;
45
57
46 const generate = useCallback(async () => {
58 const generate = useCallback(async () => {
59+ // Point still loading ...
60+ if (resolvedPoint.value === EMPTY_POINT.value) {
61+ return;
62+ }
63+
47 if (!hasNetworkKeys) {
64 if (!hasNetworkKeys) {
48 setGenerating(false);
65 setGenerating(false);
49 setNotice('Network keys not yet set.');
66 setNotice('Network keys not yet set.');
@@ -53,19 +70,9 @@ export default function useKeyfileGenerator({ seed }: useKeyfileGeneratorArgs) {
53 return;
70 return;
54 }
71 }
55
72
56− const networkSeed = seed
73+ // seeds were either generated non-deterministically,
57− ? Just(seed)
74+ // or still being derived ...
58− : await attemptNetworkSeedDerivation({
75+ if (seeds.length === 0) {
59− urbitWallet,
60− wallet,
61− authMnemonic,
62− details: point,
63− authToken,
64− point: point.value,
65− revision: networkRevision,
66− });
67−
68− if (Nothing.hasInstance(networkSeed)) {
69 setGenerating(false);
76 setGenerating(false);
70 setNotice(
77 setNotice(
71 'Custom or nondeterministic networking keys cannot be re-downloaded.'
78 'Custom or nondeterministic networking keys cannot be re-downloaded.'
@@ -74,11 +81,10 @@ export default function useKeyfileGenerator({ seed }: useKeyfileGeneratorArgs) {
74 return;
81 return;
75 }
82 }
76
83
77− const _networkSeed = networkSeed.value;
78−
79− const pair = deriveNetworkKeys(_networkSeed);
84+ const pairs = seeds.map(seed => deriveNetworkKeys(seed));
85+ const firstPair = pairs[0];
80
86
81− if (!keysMatchChain(pair, point)) {
87+ if (!keysMatchChain(firstPair, resolvedPoint)) {
82 setGenerating(false);
88 setGenerating(false);
83 setNotice('Derived networking keys do not match on-chain details.');
89 setNotice('Derived networking keys do not match on-chain details.');
84 console.log(`keys do not match details for revision ${networkRevision}`);
90 console.log(`keys do not match details for revision ${networkRevision}`);
@@ -86,24 +92,21 @@ export default function useKeyfileGenerator({ seed }: useKeyfileGeneratorArgs) {
86 }
92 }
87
93
88 setNotice('');
94 setNotice('');
89− setCode(generateCode(pair));
95+ setCode(generateCode(firstPair));
90− setKeyfile(compileNetworkKey(pair, point.value, networkRevision));
96+ setKeyfile(
97+ compileMultiKey(
98+ resolvedPoint.value,
99+ pairs.map((pair, k) => {
100+ return { revision: networkRevision + k, pair };
101+ })
102+ )
103+ );
91 setGenerating(false);
104 setGenerating(false);
92− }, [
93− networkRevision,
94− hasNetworkKeys,
105+ }, [hasNetworkKeys, seeds, resolvedPoint, networkRevision]);
95− seed,
96− urbitWallet,
97− wallet,
98− authMnemonic,
99− setCode,
100− point,
101− authToken,
102− ]);
103
106
104 const filename = useMemo(() => {
107 const filename = useMemo(() => {
105− return `${stripSigPrefix(point.patp)}-${networkRevision}.key`;
108+ return `${stripSigPrefix(resolvedPoint.patp)}-${networkRevision}.key`;
106− }, [point, networkRevision]);
109+ }, [resolvedPoint, networkRevision]);
107
110
108 const download = useCallback(() => {
111 const download = useCallback(() => {
109 if (typeof keyfile !== 'string') {
112 if (typeof keyfile !== 'string') {
@@ -136,3 +139,117 @@ export default function useKeyfileGenerator({ seed }: useKeyfileGeneratorArgs) {
136
139
137 return { ...values, bind: values };
140 return { ...values, bind: values };
138}
141}
142+
143+interface ActivationKeyfileGeneratorArgs {
144+ pointId: number;
145+ wallets: UrbitWallet[];
146+}
147+
148+/**
149+ * This Activation Keyfile Generator is used to derive a multikey during the
150+ * Activation Flow. At the time of generation, there is no Point yet set in
151+ * the Roller Store, so we need to look it up by Point ID (to retreive the
152+ * current key revision via API).
153+ *
154+ * @param pointId number - (required) the point ID for which to generate keys
155+ * @param wallets UrbitWallet[] - (required) for each wallet,
156+ * a seed + revision pair is generated and consumed by `compileMultiKey`.
157+ * It should be an array of [deterministic invite wallet, non-deterministic
158+ * master ticket wallet] (the sending and receiving wallets)
159+ */
160+export const useActivationKeyfileGenerator = ({
161+ pointId,
162+ wallets,
163+}: ActivationKeyfileGeneratorArgs) => {
164+ // resolve point
165+ const { api } = useRoller();
166+ const [point, setPoint] = useState<Point>(EMPTY_POINT);
167+
168+ const resolvePoint = useCallback(async () => {
169+ const resolved = new Point({
170+ value: pointId,
171+ details: toL1Details(await api.getPoint(pointId)),
172+ address: ETH_ZERO_ADDR,
173+ });
174+
175+ setPoint(resolved);
176+ }, [api, pointId]);
177+
178+ useEffect(() => {
179+ resolvePoint();
180+ }, [resolvePoint]);
181+
182+ // derive seeds from wallets
183+ const [seeds, setSeeds] = useState<string[]>([]);
184+ const deriveSeeds = useCallback(async () => {
185+ if (!('keyRevisionNumber' in point)) {
186+ return;
187+ }
188+
189+ const derivedSeeds = await Promise.all(
190+ wallets.map(async (w, i) => {
191+ return deriveNetworkSeedFromUrbitWallet(w, point.keyRevisionNumber + i);
192+ })
193+ );
194+
195+ setSeeds(
196+ derivedSeeds
197+ .map(maybeSeed => maybeSeed.getOrElse(null))
198+ .filter(s => s !== null)
199+ );
200+ }, [point, wallets]);
201+
202+ useEffect(() => {
203+ deriveSeeds();
204+ // eslint-disable-next-line react-hooks/exhaustive-deps
205+ }, [point]);
206+
207+ return useKeyfileGenerator({ point, seeds });
208+};
209+
210+interface SingleKeyfileGeneratorArgs {
211+ seed?: string;
212+}
213+
214+/**
215+ * This Single Keyfile Generator is used to derive network keys in multiple
216+ * views in the Bridge dashboard (Set Network Keys, Home > ID, Home > OS).
217+ * By default, it uses the logged in wallet's seed phrase.
218+ *
219+ * * @param seed string - (optional) default: provided by the logged in wallet
220+ */
221+export const useSingleKeyfileGenerator = ({
222+ seed,
223+}: SingleKeyfileGeneratorArgs) => {
224+ // use provided seed, or fallback to deriving from logged in wallet
225+ const { point } = useRollerStore();
226+ const { authMnemonic, authToken, urbitWallet, wallet }: any = useWallet();
227+ const [seeds, setSeeds] = useState<string[]>([]);
228+
229+ const deriveSeeds = useCallback(async () => {
230+ if (seed) {
231+ setSeeds([seed]);
232+ return;
233+ }
234+
235+ const derivedSeed = await attemptNetworkSeedDerivation({
236+ urbitWallet,
237+ wallet,
238+ authMnemonic,
239+ details: point,
240+ authToken,
241+ point: point.value,
242+ revision: point.keyRevisionNumber,
243+ });
244+
245+ if (Just.hasInstance(derivedSeed)) {
246+ setSeeds([derivedSeed.value]);
247+ }
248+ }, [authMnemonic, authToken, point, seed, urbitWallet, wallet]);
249+
250+ useEffect(() => {
251+ deriveSeeds();
252+ }, [deriveSeeds]);
253+
254+ return useKeyfileGenerator({ seeds });
255+};
src/lib/useMultikeyFileGenerator.tsdeleted−214
@@ -1,214 +0,0 @@
1−import * as need from 'lib/need';
2−import saveAs from 'file-saver';
3−import ob from 'urbit-ob';
4−import { Just, Nothing } from 'folktale/maybe';
5−
6−import { useCallback, useEffect, useMemo, useState } from 'react';
7−import { usePointCache } from 'store/pointCache';
8−import { usePointCursor } from 'store/pointCursor';
9−import { useWallet } from 'store/wallet';
10−import { deriveNetworkKeys } from 'urbit-key-generation';
11−import { convertToInt } from './convertToInt';
12−import {
13− attemptNetworkSeedDerivation,
14− compileMultiKey,
15− keysMatchChain,
16−} from './keys';
17−import { generateCode } from './networkCode';
18−import { L1Point } from './types/L1Point';
19−import useCurrentPermissions from './useCurrentPermissions';
20−import { stripSigPrefix } from 'form/formatters';
21−import { useRollerStore } from 'store/rollerStore';
22−
23−interface useMultikeyFileGeneratorArgs {
24− seed?: string;
25− point?: number;
26− seedWallet?: any;
27− inviteMasterTicketWallet?: any;
28−}
29−
30−/**
31− * defaults:
32− * - seed: derived from wallet, mnemonic, or token (if posisble)
33− * - point: the current pointCursor
34− */
35−export default function useMultikeyFileGenerator({
36− seed,
37− point,
38− seedWallet,
39− inviteMasterTicketWallet,
40−}: useMultikeyFileGeneratorArgs) {
41− const { urbitWallet, wallet, authMnemonic, authToken }: any = useWallet();
42− const { pointCursor }: any = usePointCursor();
43− const { syncDetails, getDetails }: any = usePointCache();
44− const { isOwner, isManagementProxy } = useCurrentPermissions();
45− const rollerStore = useRollerStore();
46−
47− const [notice, setNotice] = useState('Deriving networking keys...');
48− const [downloaded, setDownloaded] = useState(false);
49− const [generating, setGenerating] = useState(true);
50− const [keyfile, setKeyfile] = useState<boolean | string>(false);
51− const [code, setCode] = useState(false);
52−
53− const _point = useMemo(() => point || need.point(pointCursor), [
54− point,
55− pointCursor,
56− ]);
57− const details = getDetails(_point);
58− const _details: L1Point | null = useMemo(
59− () =>
60− rollerStore?.point?.isL2
61− ? rollerStore.point
62− : details.matchWith({
63− Just: (d: any) => need.details(d),
64− Nothing: () => null,
65− }),
66− [details, rollerStore.point]
67− );
68−
69− const currentRevision: number = useMemo(
70− () => convertToInt(_details?.keyRevisionNumber || 0, 10),
71− [_details]
72− );
73− const nextRevision = useMemo(() => currentRevision + 1, [currentRevision]);
74−
75− const pairFromRevision = useCallback(
76− async (revision: number, useInviteMasterTicketWallet = false) => {
77− if (!_details) {
78− return;
79− }
80−
81− // During the activation flow, we pass in the
82− // inviteMasterTicketWallet to derive the multikey
83− const derivationWallet =
84− useInviteMasterTicketWallet && inviteMasterTicketWallet
85− ? inviteMasterTicketWallet
86− : seedWallet || urbitWallet;
87−
88− const networkSeed = seed
89− ? Just(seed)
90− : await attemptNetworkSeedDerivation({
91− urbitWallet: derivationWallet,
92− wallet,
93− authMnemonic,
94− details: _details,
95− authToken,
96− point: _point,
97− revision: revision,
98− });
99−
100− if (Nothing.hasInstance(networkSeed)) {
101− setGenerating(false);
102− setNotice(
103− 'Custom or nondeterministic networking keys cannot be re-downloaded.'
104− );
105− console.log(`seed is nondeterminable for revision ${revision}`);
106− return;
107− }
108−
109− const _networkSeed = networkSeed.value;
110−
111− return deriveNetworkKeys(_networkSeed);
112− },
113− [
114− _details,
115− inviteMasterTicketWallet,
116− seedWallet,
117− urbitWallet,
118− seed,
119− wallet,
120− authMnemonic,
121− authToken,
122− _point,
123− ]
124− );
125−
126− const hasNetworkKeys = currentRevision > 0;
127− const available =
128− (isOwner || isManagementProxy) && hasNetworkKeys && !!keyfile;
129−
130− const generate = useCallback(async () => {
131− if (!hasNetworkKeys) {
132− setGenerating(false);
133− setNotice('Network keys not yet set.');
134− console.log(
135− `no networking keys available for revision ${currentRevision}`
136− );
137− return;
138− }
139−
140− const currentPair = await pairFromRevision(currentRevision);
141−
142− if (!currentPair || !keysMatchChain(currentPair, _details || {})) {
143− setGenerating(false);
144− setNotice('Derived networking keys do not match on-chain details.');
145− console.log(`keys do not match details for revision ${currentRevision}`);
146− return;
147− }
148−
149− // During the activation flow, we want to use the invite wallet for the next pair
150− const nextPair = await pairFromRevision(nextRevision, true);
151−
152− setNotice('');
153− setCode(generateCode(currentPair));
154− setKeyfile(
155− compileMultiKey(_point, [
156− {
157− revision: currentRevision,
158− pair: currentPair,
159− },
160− {
161− revision: nextRevision,
162− pair: nextPair,
163− },
164− ])
165− );
166− setGenerating(false);
167− }, [
168− _details,
169− _point,
170− currentRevision,
171− hasNetworkKeys,
172− nextRevision,
173− pairFromRevision,
174− ]);
175−
176− const filename = useMemo(() => {
177− return `${stripSigPrefix(ob.patp(_point))}-${currentRevision}.key`;
178− }, [_point, currentRevision]);
179−
180− const download = useCallback(() => {
181− if (typeof keyfile !== 'string') {
182− return;
183− }
184−
185− saveAs(
186− new Blob([keyfile], {
187− type: 'text/plain;charset=utf-8',
188− }),
189− filename
190− );
191− setDownloaded(true);
192− }, [filename, keyfile]);
193−
194− useEffect(() => {
195− syncDetails(_point);
196− }, [_point, syncDetails]);
197−
198− useEffect(() => {
199− generate();
200− }, [generate]);
201−
202− const output = {
203− generating,
204− available,
205− downloaded,
206− download,
207− filename,
208− notice,
209− keyfile,
210− code,
211− };
212−
213− return { ...output, bind: output };
214−}
src/lib/useRoller.ts+1−6
@@ -31,12 +31,7 @@ import {
31 registerProxyAddress,
31 registerProxyAddress,
32 isL2Spawn,
32 isL2Spawn,
33} from './utils/roller';
33} from './utils/roller';
34−import {
35− ETH_ZERO_ADDR,
36− POINT_DOMINIONS,
34+import { POINT_DOMINIONS, ROLLER_HOSTS, TEN_SECONDS } from './constants';
37− ROLLER_HOSTS,
38− TEN_SECONDS,
39−} from './constants';
40
35
41import {
36import {
42 Config,
37 Config,
src/urbit-key-generation.d.ts+56
@@ -1,3 +1,18 @@
1+type ValueOf<T> = T[keyof T];
2+
3+type CHILD_SEED_TYPES = {
4+ OWNERSHIP: 'ownership';
5+ TRANSFER: 'transfer';
6+ SPAWN: 'spawn';
7+ VOTING: 'voting';
8+ MANAGEMENT: 'management';
9+ NETWORK: 'network';
10+ BITCOIN_MAINNET: 'bitcoinMainnet';
11+ BITCOIN_TESTNET: 'bitcoinTestnet';
12+};
13+
14+type ChildSeedType = ValueOf<CHILD_SEED_TYPES>;
15+
1interface NetworkKeys {
16interface NetworkKeys {
2 crypt: {
17 crypt: {
3 private: string;
18 private: string;
@@ -23,6 +38,8 @@ interface WalletNode {
23 derivationPath: string;
38 derivationPath: string;
24}
39}
25
40
41+interface BitcoinWallet extends WalletNode {}
42+
26interface WalletConfig {
43interface WalletConfig {
27 ticket: string;
44 ticket: string;
28 ship: number;
45 ship: number;
@@ -55,15 +72,54 @@ interface UrbitWallet {
55 | {};
72 | {};
56 voting?: WalletNode;
73 voting?: WalletNode;
57 spawn?: WalletNode;
74 spawn?: WalletNode;
75+ bitcoinTestnet: BitcoinWallet;
76+ bitcoinMainnet: BitcoinWallet;
58}
77}
59
78
60declare module 'urbit-key-generation' {
79declare module 'urbit-key-generation' {
80+ const CHILD_SEED_TYPES: CHILD_SEED_TYPES;
81+ function addressFromSecp256k1Public(pub: string): string;
82+ function argon2u(entropy: Buffer, ship: number): Promise<Uint8Array>;
61 function combine(shards: string[]): string;
83 function combine(shards: string[]): string;
84+ function deriveNetworkInfo(
85+ mnemonic: string,
86+ revision: number,
87+ passphrase?: string
88+ ): { type: 'network'; seed: string; keys: WalletNodeKeys };
62 function deriveNetworkKeys(hex: string): NetworkKeys;
89 function deriveNetworkKeys(hex: string): NetworkKeys;
90+ function deriveNetworkSeed(
91+ mnemonic: string,
92+ passphrase: string,
93+ revision: number
94+ ): string;
95+ function deriveNode(
96+ master: Uint8Array,
97+ type: ChildSeedType,
98+ derivationPath: string,
99+ passphrase?: string
100+ ): WalletNode;
101+ function deriveNodeKeys(
102+ mnemonic: string,
103+ derivationPath: string,
104+ passphrase?: string
105+ ): WalletNodeKeys;
106+ function deriveNodeSeed(master: Uint8Array, type: ChildSeedType): string;
107+ function generateCode(pair: NetworkKeys, step: number): string;
108+ function generateKeyfile(
109+ pair: NetworkKeys,
110+ point: number,
111+ revision: number
112+ ): string;
113+ function generateOwnershipWallet({
114+ ticket,
115+ ship,
116+ passphrase,
117+ }: WalletConfig): UrbitWallet;
63 function generateWallet({
118 function generateWallet({
64 ticket,
119 ticket,
65 ship,
120 ship,
66 passphrase,
121 passphrase,
67 boot,
122 boot,
68 }: WalletConfig): UrbitWallet;
123 }: WalletConfig): UrbitWallet;
124+ function shard(ticket: string): string[];
69}
125}
src/views/Activate/MasterKeyDownload.tsx+4−5
@@ -16,9 +16,9 @@ import { useLocalRouter } from 'lib/LocalRouter';
16import PaperBuilder from 'components/PaperBuilder';
16import PaperBuilder from 'components/PaperBuilder';
17import { DEFAULT_FADE_TIMEOUT, MASTER_KEY_DURATION } from 'lib/constants';
17import { DEFAULT_FADE_TIMEOUT, MASTER_KEY_DURATION } from 'lib/constants';
18import { timeout } from 'lib/timeout';
18import { timeout } from 'lib/timeout';
19−import useMultikeyFileGenerator from 'lib/useMultikeyFileGenerator';
20import { downloadWallet } from 'lib/invite';
19import { downloadWallet } from 'lib/invite';
21import View from 'components/View';
20import View from 'components/View';
21+import { useActivationKeyfileGenerator } from 'lib/useKeyfileGenerator';
22
22
23const MasterKeyDownload = () => {
23const MasterKeyDownload = () => {
24 const {
24 const {
@@ -46,10 +46,9 @@ const MasterKeyDownload = () => {
46 Just: (p: any) => p.value.toFixed(),
46 Just: (p: any) => p.value.toFixed(),
47 });
47 });
48
48
49− const { keyfile, filename } = useMultikeyFileGenerator({
49+ const { keyfile, filename } = useActivationKeyfileGenerator({
50− point,
50+ pointId: point,
51− seedWallet: inviteWallet,
52− inviteMasterTicketWallet,
51+ wallets: [inviteWallet.value, inviteMasterTicketWallet.value],
53 });
52 });
54
53
55 // sync paper value to activation state
54 // sync paper value to activation state
src/views/Activate/useActivateFlowState.js+1−2
@@ -17,14 +17,13 @@ export default function useActivateFlowState() {
17 // it is for this wallet
17 // it is for this wallet
18 // type UrbitWallet
18 // type UrbitWallet
19 const [inviteMasterTicketWallet, setInviteMasterTicketWallet] = useState(Nothing());
19 const [inviteMasterTicketWallet, setInviteMasterTicketWallet] = useState(Nothing());
20− // The wallet generated deterministically during the invite flow;
20+ // The wallet generated deterministically during the invite creation flow;
21 // it is re-generated when the user starts the Activate flow. It is used
21 // it is re-generated when the user starts the Activate flow. It is used
22 // to derive and confirm a shareable ticket that a user can activate a point with.
22 // to derive and confirm a shareable ticket that a user can activate a point with.
23 // type UrbitWallet
23 // type UrbitWallet
24 const [inviteWallet, setInviteWallet] = useState(Nothing());
24 const [inviteWallet, setInviteWallet] = useState(Nothing());
25 // This wallet is generated from the invite wallet's seed phrase.
25 // This wallet is generated from the invite wallet's seed phrase.
26 // It is used during the transfer phase of the invite flow to send transactions.
26 // It is used during the transfer phase of the invite flow to send transactions.
27− // useMultiKeyFileGenerator.
28 // type bip32.BIP32Interface
27 // type bip32.BIP32Interface
29 const [sendWallet, setSendWallet] = useState(Nothing());
28 const [sendWallet, setSendWallet] = useState(Nothing());
30
29
src/views/UrbitID/DownloadKeys.js+2−2
@@ -9,7 +9,7 @@ import { DownloadButton, RestartButton } from 'components/Buttons';
9import PaperBuilder from 'components/PaperBuilder';
9import PaperBuilder from 'components/PaperBuilder';
10
10
11import { downloadWallet } from 'lib/invite';
11import { downloadWallet } from 'lib/invite';
12−import useMultikeyFileGenerator from 'lib/useMultikeyFileGenerator';
12+import { useSingleKeyfileGenerator } from 'lib/useKeyfileGenerator';
13
13
14import { useWallet } from 'store/wallet';
14import { useWallet } from 'store/wallet';
15import { Grid, P } from 'indigo-react';
15import { Grid, P } from 'indigo-react';
@@ -26,7 +26,7 @@ export default function AdminRedownload() {
26 const _urbitWallet = need.wallet(urbitWallet);
26 const _urbitWallet = need.wallet(urbitWallet);
27 const point = need.point(pointCursor);
27 const point = need.point(pointCursor);
28
28
29− const { keyfile, filename } = useMultikeyFileGenerator({});
29+ const { keyfile, filename } = useSingleKeyfileGenerator({});
30
30
31 const [paper, setPaper] = useState(Nothing());
31 const [paper, setPaper] = useState(Nothing());
32 const [downloaded, setDownloaded] = useState(false);
32 const [downloaded, setDownloaded] = useState(false);
src/views/UrbitID/Home.tsx+2−2
@@ -13,7 +13,7 @@ import {
13} from 'lib/constants';
13} from 'lib/constants';
14import { abbreviateAddress } from 'lib/utils/address';
14import { abbreviateAddress } from 'lib/utils/address';
15import { downloadWallet } from 'lib/invite';
15import { downloadWallet } from 'lib/invite';
16−import useMultikeyFileGenerator from 'lib/useMultikeyFileGenerator';
16+import { useSingleKeyfileGenerator } from 'lib/useKeyfileGenerator';
17
17
18import { useWallet } from 'store/wallet';
18import { useWallet } from 'store/wallet';
19import { useRollerStore } from 'store/rollerStore';
19import { useRollerStore } from 'store/rollerStore';
@@ -43,7 +43,7 @@ export default function UrbitIDHome() {
43 return null;
43 return null;
44 }
44 }
45 }, [urbitWallet]);
45 }, [urbitWallet]);
46− const { keyfile, filename } = useMultikeyFileGenerator({});
46+ const { keyfile, filename } = useSingleKeyfileGenerator({});
47 const [paper, setPaper] = useState(Nothing());
47 const [paper, setPaper] = useState(Nothing());
48
48
49 const downloadKeys = useCallback(() => {
49 const downloadKeys = useCallback(() => {
src/views/UrbitOS/AccessCode.test.tsx+2−2
@@ -4,7 +4,7 @@ import AccessCode from './AccessCode';
4
4
5describe('AccessCode', () => {
5describe('AccessCode', () => {
6 describe('when code is not available', () => {
6 describe('when code is not available', () => {
7− // Value is initialized as `false` in `useMultikeyFileGenerator`
7+ // Value is initialized as `false` in `useKeyfileGenerator`
8 const testCode = false;
8 const testCode = false;
9
9
10 it('does not render the component', () => {
10 it('does not render the component', () => {
@@ -15,7 +15,7 @@ describe('AccessCode', () => {
15 });
15 });
16
16
17 describe('when code is available', () => {
17 describe('when code is available', () => {
18− // Value has been loaded from `useMultikeyFileGenerator`
18+ // Value has been loaded from `useKeyfileGenerator`
19 const testCode = 'foo-bar';
19 const testCode = 'foo-bar';
20
20
21 it('renders the component', () => {
21 it('renders the component', () => {
src/views/UrbitOS/Home.tsx+2−2
@@ -9,7 +9,7 @@ import BodyPane from 'components/L2/Window/BodyPane';
9import { ReactComponent as KeyfileIcon } from 'assets/keyfile.svg';
9import { ReactComponent as KeyfileIcon } from 'assets/keyfile.svg';
10
10
11import { useLocalRouter } from 'lib/LocalRouter';
11import { useLocalRouter } from 'lib/LocalRouter';
12−import useMultikeyFileGenerator from 'lib/useMultikeyFileGenerator';
12+import { useSingleKeyfileGenerator } from 'lib/useKeyfileGenerator';
13import { Box, Button, Row } from '@tlon/indigo-react';
13import { Box, Button, Row } from '@tlon/indigo-react';
14import CopiableWithTooltip from 'components/copiable/CopiableWithTooltip';
14import CopiableWithTooltip from 'components/copiable/CopiableWithTooltip';
15
15
@@ -42,7 +42,7 @@ export default function UrbitOSHome() {
42 names,
42 names,
43 ]);
43 ]);
44
44
45− const { code, download } = useMultikeyFileGenerator({});
45+ const { code, download } = useSingleKeyfileGenerator({});
46
46
47 return (
47 return (
48 <Window className="os-home">
48 <Window className="os-home">
src/views/UrbitOS/NetworkKeys.tsx+2−2
@@ -27,7 +27,7 @@ import {
27import useEthereumTransaction from 'lib/useEthereumTransaction';
27import useEthereumTransaction from 'lib/useEthereumTransaction';
28import { GAS_LIMITS, ONE_SECOND } from 'lib/constants';
28import { GAS_LIMITS, ONE_SECOND } from 'lib/constants';
29import { addHexPrefix } from 'lib/utils/address';
29import { addHexPrefix } from 'lib/utils/address';
30−import useMultikeyFileGenerator from 'lib/useMultikeyFileGenerator';
30+import { useSingleKeyfileGenerator } from 'lib/useKeyfileGenerator';
31
31
32import DownloadKeyfileButton from 'components/DownloadKeyfileButton';
32import DownloadKeyfileButton from 'components/DownloadKeyfileButton';
33import InlineEthereumTransaction from 'components/InlineEthereumTransaction';
33import InlineEthereumTransaction from 'components/InlineEthereumTransaction';
@@ -66,7 +66,7 @@ function useSetKeys(
66 generating: keyfileGenerating,
66 generating: keyfileGenerating,
67 filename,
67 filename,
68 bind: keyfileBind,
68 bind: keyfileBind,
69− } = useMultikeyFileGenerator({ seed: manualNetworkSeed });
69+ } = useSingleKeyfileGenerator({ seed: manualNetworkSeed });
70
70
71 const buildNetworkSeed = useCallback(
71 const buildNetworkSeed = useCallback(
72 async manualSeed => {
72 async manualSeed => {