Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,7 @@ export default () => {
accountsArray,
key.methods as KeyMethods,
getBaseEVMAccountCreationCoinsAndTokens(),
key.wallets,
);
key.wallets.push(...wallets);
dispatch(successAddWallet({key}));
Expand Down Expand Up @@ -800,6 +801,7 @@ export default () => {
[0],
key.methods as KeyMethods,
getBaseSVMAccountCreationCoinsAndTokens(),
key.wallets,
);
key.wallets.push(...wallets);
logManager.info(
Expand Down
77 changes: 41 additions & 36 deletions src/navigation/onboarding/screens/CreateKey.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {NativeStackScreenProps} from '@react-navigation/native-stack';
import React, {useEffect, useLayoutEffect, useRef} from 'react';
import React, {useEffect, useLayoutEffect, useRef, useCallback} from 'react';
import {ScrollView} from 'react-native';
import {useAndroidBackHandler} from 'react-navigation-backhandler';
import styled from 'styled-components/native';
Expand Down Expand Up @@ -109,6 +109,45 @@ const CreateOrImportKey = ({
);
};

const onCreateKeyPress = useCallback(async () => {
try {
const context = 'onboarding';

showOngoingProcess('CREATING_KEY');
await sleep(500);

const createdKey = await dispatch(
startCreateKey(getBaseKeyCreationCoinsAndTokens(), context),
);

dispatch(setHomeCarouselConfig({id: createdKey.id, show: true}));
hideOngoingProcess();

askForTrackingThenNavigate(() => {
dispatch(Analytics.track('Clicked Create New Key', {context}));
navigation.navigate('BackupKey', {
context,
key: createdKey,
});
});
} catch (err: any) {
const errstring =
err instanceof Error ? err.message : JSON.stringify(err);

logManager.error(`Error creating key: ${errstring}`);
hideOngoingProcess();
await sleep(500);
showErrorModal(errstring);
}
}, [
dispatch,
navigation,
showOngoingProcess,
hideOngoingProcess,
askForTrackingThenNavigate,
showErrorModal,
]);

useLayoutEffect(() => {
navigation.setOptions({
gestureEnabled: false,
Expand Down Expand Up @@ -147,41 +186,7 @@ const CreateOrImportKey = ({
<Button
accessibilityLabel="create-a-key-button"
buttonStyle={'primary'}
onPress={async () => {
try {
const context = 'onboarding';
showOngoingProcess('CREATING_KEY');
const createdKey = await dispatch(
startCreateKey(
getBaseKeyCreationCoinsAndTokens(),
'onboarding',
),
);

dispatch(
setHomeCarouselConfig({id: createdKey.id, show: true}),
);
hideOngoingProcess();
askForTrackingThenNavigate(() => {
dispatch(
Analytics.track('Clicked Create New Key', {
context: 'onboarding',
}),
);
navigation.navigate('BackupKey', {
context,
key: createdKey,
});
});
} catch (err: any) {
const errstring =
err instanceof Error ? err.message : JSON.stringify(err);
logManager.error(`Error creating key: ${errstring}`);
hideOngoingProcess();
await sleep(500);
showErrorModal(errstring);
}
}}>
onPress={onCreateKeyPress}>
{t('Create a Key')}
</Button>
</ActionContainer>
Expand Down
1 change: 1 addition & 0 deletions src/navigation/wallet/screens/KeyOverview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -886,6 +886,7 @@ const KeyOverview = () => {
accountsArray,
key.methods as KeyMethods,
getBaseEVMAccountCreationCoinsAndTokens(),
key.wallets,
password,
);

Expand Down
77 changes: 77 additions & 0 deletions src/store/wallet/effects/address/address.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,34 @@ import {Effect} from '../../../index';
import {successGetReceiveAddress} from '../../wallet.actions';
import {logManager} from '../../../../managers/LogManager';

const perfNow = () =>
typeof global?.performance !== 'undefined' &&
typeof global.performance?.now === 'function'
? global.performance.now()
: Date.now();

const perfInfo = (
label: string,
start: number,
extra?: Record<string, unknown>,
) => {
const ms = perfNow() - start;
const suffix = extra ? ` | ${JSON.stringify(extra)}` : '';
logManager.info(`[ADDRESS PERF] ${label}: ${ms.toFixed(1)}ms${suffix}`);
return ms;
};

const perfError = (
label: string,
start: number,
extra?: Record<string, unknown>,
) => {
const ms = perfNow() - start;
const suffix = extra ? ` | ${JSON.stringify(extra)}` : '';
logManager.error(`[ADDRESS PERF] ${label}: ${ms.toFixed(1)}ms${suffix}`);
return ms;
};

const BWC = BwcProvider.getInstance();

const Bitcore = BWC.getBitcore();
Expand Down Expand Up @@ -95,11 +123,30 @@ export const createWalletAddress =
wallet.id.replace(`-${token.address}`, '');
}

const totalStart = perfNow();
logManager.info(
`[ADDRESS PERF] createWalletAddress.start | ${JSON.stringify({
walletId: wallet?.credentials?.walletId,
coin: wallet?.credentials?.coin,
chain: wallet?.credentials?.chain,
newAddress,
})}`,
);

try {
let addressObj: Address | undefined;

if (!newAddress) {
const getLatestMainAddressStart = perfNow();
addressObj = await getLatestMainAddress(wallet);
perfInfo(
`createWalletAddress.getLatestMainAddress.${wallet.credentials.chain}.${wallet.credentials.coin}`,
getLatestMainAddressStart,
{
walletId: wallet.credentials.walletId,
},
);

validateOrThrow(addressObj, network);

if (addressObj?.address) {
Expand All @@ -114,15 +161,38 @@ export const createWalletAddress =
);
}
logManager.info('returned last main address');
perfInfo(
`createWalletAddress.TOTAL.${wallet.credentials.chain}.${wallet.credentials.coin}`,
totalStart,
{
walletId: wallet.credentials.walletId,
},
);
return resolve(addressObj.address);
}
}
// if no main address, generate a new one
try {
const getNewAddressStart = perfNow();
addressObj = await getNewAddress(wallet);
perfInfo(
`createWalletAddress.getNewAddress.${wallet.credentials.chain}.${wallet.credentials.coin}`,
getNewAddressStart,
{
walletId: wallet.credentials.walletId,
},
);
} catch (err: any) {
if (err?.name?.includes?.('MAIN_ADDRESS_GAP_REACHED')) {
const getLatestMainAddressStart2 = perfNow();
const latest = await getLatestMainAddress(wallet);
perfInfo(
`createWalletAddress.getLatestMainAddress2.${wallet.credentials.chain}.${wallet.credentials.coin}`,
getLatestMainAddressStart2,
{
walletId: wallet.credentials.walletId,
},
);
validateOrThrow(latest, network);
const receiveAddress = latest.address;
wallet.receiveAddress = receiveAddress;
Expand Down Expand Up @@ -155,6 +225,13 @@ export const createWalletAddress =
);
}
logManager.info('returned new generated address');
perfInfo(
`createWalletAddress.TOTAL.${wallet.credentials.chain}.${wallet.credentials.coin}`,
totalStart,
{
walletId: wallet.credentials.walletId,
},
);
return resolve(addressObj.address);
}
return reject({type: 'GENERAL_ERROR', error: 'No address generated'});
Expand Down
Loading