crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for fortmatic

Browse Source
This commit is contained in:
David Sun 2020-02-02 18:28:26 -05:00
parent d590b004c1
commit f3b8ae0781
5 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/instant/src/redux/async_data.ts
View File

@ -13,6 +13,7 @@ import { swapQuoteUpdater } from '../util/swap_quote_updater';
import { actions } from './actions';
import { State } from './reducer';
import { providerStateFactory } from '../util/provider_state_factory';
export const asyncData = {
fetchEthPriceAndDispatchToStore: async (dispatch: Dispatch) => {
@ -71,18 +72,19 @@ export const asyncData = {
try {
// TODO(bmillman): Add support at the web3Wrapper level for calling `eth_requestAccounts` instead of calling enable here
const isPrivacyModeEnabled = (provider as any).enable !== undefined;
if (providerState.name !== 'Fortmatic') {
availableAddresses =
isPrivacyModeEnabled && shouldAttemptUnlock
? await (provider as any).enable()
: await web3Wrapper.getAvailableAddressesAsync();
} else {
availableAddresses = await web3Wrapper.getAvailableAddressesAsync();
}
availableAddresses =
isPrivacyModeEnabled && shouldAttemptUnlock
? await (provider as any).enable()
: await web3Wrapper.getAvailableAddressesAsync();
console.log(availableAddresses);
} catch (e) {
analytics.trackAccountUnlockDenied();
if (e.message.includes('Fortmatic: User denied account access.')) {
dispatch(actions.setAccountStateNone());
// If Fortmatic is not used, revert to injected provider
const initialProviderState = providerStateFactory.getInitialProviderStateWithCurrentProviderState(
providerState,
);
dispatch(actions.setProviderState(initialProviderState));
} else {
dispatch(actions.setAccountStateLocked());
}

1
packages/instant/src/types.ts
View File

@ -115,6 +115,7 @@ export interface ProviderState {
web3Wrapper: Web3Wrapper;
account: Account;
orderSource: OrderSource;
isProviderInjected: boolean;
}
export enum AccountState {

5
packages/instant/src/util/env.ts
View File

@ -51,6 +51,8 @@ export const envUtil = {
return ProviderType.Parity;
} else if (anyProvider.isMetaMask) {
return ProviderType.MetaMask;
} else if (anyProvider.isFortmatic) {
return ProviderType.Fortmatic;
} else if (_.get(window, 'SOFA') !== undefined) {
return ProviderType.CoinbaseWallet;
} else if (_.get(window, '__CIPHER__') !== undefined) {
@ -58,8 +60,7 @@ export const envUtil = {
} else if (envUtil.getBrowser() === Browser.Opera && !anyProvider.isMetaMask) {
return ProviderType.Opera;
}
// If the provider is not supported by 0x, use fortmatic
return ProviderType.Fortmatic;
return undefined;
},
getProviderName(provider: ZeroExProvider): string {
const providerTypeIfExists = envUtil.getProviderType(provider);

1
packages/instant/src/util/heartbeater_factory.ts
View File

@ -11,7 +11,6 @@ export interface HeartbeatFactoryOptions {
export const generateAccountHeartbeater = (options: HeartbeatFactoryOptions): Heartbeater => {
const { store, shouldPerformImmediatelyOnStart } = options;
return new Heartbeater(async () => {
console.log('beat');
await asyncData.fetchAccountInfoAndDispatchToStore(store.getState().providerState, store.dispatch, false);
}, shouldPerformImmediatelyOnStart);
};

28
packages/instant/src/util/provider_state_factory.ts
View File

@ -52,6 +52,7 @@ export const providerStateFactory = {
swapQuoteConsumer: assetSwapperFactory.getSwapQuoteConsumer(provider, network),
account: LOADING_ACCOUNT,
orderSource,
isProviderInjected: false,
};
return providerState;
},
@ -71,6 +72,7 @@ export const providerStateFactory = {
swapQuoteConsumer: assetSwapperFactory.getSwapQuoteConsumer(injectedProviderIfExists, network),
account: LOADING_ACCOUNT,
orderSource,
isProviderInjected: true,
};
return providerState;
} else {
@ -83,7 +85,6 @@ export const providerStateFactory = {
walletDisplayName?: string,
): ProviderState => {
const provider = providerFactory.getFallbackNoSigningProvider(network);
console.log(walletDisplayName, envUtil.getProviderDisplayName(provider));
const providerState: ProviderState = {
name: 'Fallback',
displayName: walletDisplayName || envUtil.getProviderDisplayName(provider),
@ -93,9 +94,32 @@ export const providerStateFactory = {
swapQuoteConsumer: assetSwapperFactory.getSwapQuoteConsumer(provider, network),
account: NO_ACCOUNT,
orderSource,
isProviderInjected: true,
};
return providerState;
},
// function to call getInitialProviderState with parameters retreived from a provided ProviderState
getInitialProviderStateWithCurrentProviderState: (
currentProviderState: ProviderState,
): ProviderState => {
const orderSource = currentProviderState.orderSource;
const chainId = currentProviderState.swapQuoter.chainId;
// If provider is provided to instant, use that and the displayName
if (!currentProviderState.isProviderInjected) {
return providerStateFactory.getInitialProviderState(
orderSource,
chainId,
currentProviderState.provider,
currentProviderState.displayName,
);
}
const newProviderState = providerStateFactory.getInitialProviderState(
orderSource,
chainId,
);
newProviderState.account = NO_ACCOUNT;
return newProviderState;
},
getProviderStateBasedOnProviderType: (
currentProviderState: ProviderState,
providerType: ProviderType,
@ -115,6 +139,7 @@ export const providerStateFactory = {
swapQuoteConsumer: assetSwapperFactory.getSwapQuoteConsumer(provider, chainId),
account: LOADING_ACCOUNT,
orderSource,
isProviderInjected: true,
};
}
}
@ -130,6 +155,7 @@ export const providerStateFactory = {
swapQuoteConsumer: assetSwapperFactory.getSwapQuoteConsumer(fmProvider, chainId),
account: LOADING_ACCOUNT,
orderSource,
isProviderInjected: true,
};
}
return providerStateFactory.getInitialProviderState(