git.iko.soy/bridge
on master help sign in
activate: new master ticket is non-deterministic
a736497tomholford
src/views/Activate/ActivateCodeForm.tsx+11−4
compare with master
unifiedsplit
@@ -4,7 +4,11 @@ import { WARNING } from 'form/helpers';
4import { FORM_ERROR } from 'final-form';
4import { FORM_ERROR } from 'final-form';
5import { Just } from 'folktale/maybe';
5import { Just } from 'folktale/maybe';
6import BridgeForm from 'form/BridgeForm';
6import BridgeForm from 'form/BridgeForm';
7+import {
7−import { PLACEHOLDER_PLANET, PLACEHOLDER_TICKET, TicketInput } from 'form/Inputs';
8+ PLACEHOLDER_PLANET,
9+ PLACEHOLDER_TICKET,
10+ TicketInput,
11+} from 'form/Inputs';
8import {
12import {
9 composeValidator,
13 composeValidator,
10 buildPatqValidator,
14 buildPatqValidator,
@@ -18,7 +22,7 @@ import { useActivateFlow } from './ActivateFlow';
18import WarningBox from 'components/WarningBox';
22import WarningBox from 'components/WarningBox';
19import useRoller from 'lib/useRoller';
23import useRoller from 'lib/useRoller';
20import useImpliedTicket from 'lib/useImpliedTicket';
24import useImpliedTicket from 'lib/useImpliedTicket';
21−import { generateWallet } from 'lib/walletgen';
25+import { generateWallet, makeTicket } from 'lib/walletgen';
22import { urbitWalletFromTicket, walletFromMnemonic } from 'lib/wallet';
26import { urbitWalletFromTicket, walletFromMnemonic } from 'lib/wallet';
23import { DEFAULT_HD_PATH, POINT_PROXIES } from 'lib/constants';
27import { DEFAULT_HD_PATH, POINT_PROXIES } from 'lib/constants';
24import useBreakpoints from 'lib/useBreakpoints';
28import useBreakpoints from 'lib/useBreakpoints';
@@ -153,7 +157,11 @@ const ActivateCodeForm = ({ afterSubmit }: ActivateCodeFormProps) => {
153 setDerivedPatp(Just(ob.patp(point)));
157 setDerivedPatp(Just(ob.patp(point)));
154 setDerivedPoint(Just(point));
158 setDerivedPoint(Just(point));
155 setDerivedPointDominion(Just(rollerPoint.dominion));
159 setDerivedPointDominion(Just(rollerPoint.dominion));
160+
161+ const newMasterTicket = await makeTicket(point);
156− setInviteMasterTicketWallet(Just(await generateWallet(point, ticket, true)));
162+ setInviteMasterTicketWallet(
163+ Just(await generateWallet(point, newMasterTicket, true))
164+ );
157 setIsIn(false);
165 setIsIn(false);
158 await timeout(100);
166 await timeout(100);
159 } else {
167 } else {
@@ -176,7 +184,6 @@ const ActivateCodeForm = ({ afterSubmit }: ActivateCodeFormProps) => {
176 setDerivedPointDominion,
184 setDerivedPointDominion,
177 setInviteMasterTicketWallet,
185 setInviteMasterTicketWallet,
178 setIsIn,
186 setIsIn,
179− setSendWallet,
180 ]
187 ]
181 );
188 );
182
189