Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(HQM-420): encrypted_data_not_found #1886

Merged
Merged
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
44 changes: 37 additions & 7 deletions src/screens/HomeStack/SettingsStack/settings-test.tsx
Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@ import {
import {AddressUtils} from '@app/helpers/address-utils';
import {awaitForCaptcha} from '@app/helpers/await-for-captcha';
import {awaitForJsonRpcSign} from '@app/helpers/await-for-json-rpc-sign';
import {awaitForProvider} from '@app/helpers/await-for-provider';
import {
QRScannerTypeEnum,
awaitForScanQr,
@@ -577,7 +578,7 @@ export const SettingsTestScreen = observer(() => {
Clipboard.setString(pushToken);
toastMessage('Copied to clipboard');
}}>
{uid}
{pushToken}
</Text>
<Spacer height={8} />
</>
@@ -696,7 +697,8 @@ export const SettingsTestScreen = observer(() => {
<Input
placeholder="{ method: 'eth_sendTransactrion', params: [...] }"
value={rawSignData}
error={!isValidRawSignData}
error={!!rawSignData && !isValidRawSignData}
multiline
onChangeText={data => {
setRawSignData(data);
try {
@@ -711,15 +713,43 @@ export const SettingsTestScreen = observer(() => {
<Button
title="sign request"
disabled={!isValidRawSignData}
onPress={() => {
awaitForJsonRpcSign({
metadata: HAQQ_METADATA,
request: signData!,
});
onPress={async () => {
try {
const address = await awaitForWallet({
title: I18N.selectAccount,
wallets: Wallet.getAllVisible(),
});
const providers = Provider.getAll();
const initialProviderId = app.provider.id;
const providerId = await awaitForProvider({
providers,
initialProviderId: initialProviderId!,
title: I18N.networks,
});
const result = await awaitForJsonRpcSign({
metadata: HAQQ_METADATA,
request: signData!,
selectedAccount: address,
chainId: Provider.getById(providerId)?.ethChainId,
});
Alert.alert('Result', result, [
{text: 'Close'},
{text: 'Copy', onPress: () => Clipboard.setString(result)},
]);
} catch (err) {
Alert.alert('error', JSON.stringify(err, null, 2));
}
}}
variant={ButtonVariant.contained}
/>
<Spacer height={8} />
<Button
title="Clear"
disabled={!rawSignData}
onPress={() => setRawSignData('')}
variant={ButtonVariant.second}
/>
<Spacer height={8} />
<Title text="WalletConnect" />
<Input
placeholder="wc:"
18 changes: 17 additions & 1 deletion src/screens/settings-developer-tools.tsx
Original file line number Diff line number Diff line change
@@ -197,7 +197,8 @@ export const SettingsDeveloperTools = observer(() => {
<Input
placeholder="{ method: 'eth_sendTransactrion', params: [...] }"
value={rawSignData}
error={!isValidRawSignData}
error={!!rawSignData && !isValidRawSignData}
multiline
onChangeText={data => {
setRawSignData(data);
try {
@@ -218,10 +219,18 @@ export const SettingsDeveloperTools = observer(() => {
title: I18N.selectAccount,
wallets: Wallet.getAllVisible(),
});
const providers = Provider.getAll();
const initialProviderId = app.provider.id;
const providerId = await awaitForProvider({
providers,
initialProviderId: initialProviderId!,
title: I18N.networks,
});
const result = await awaitForJsonRpcSign({
metadata: HAQQ_METADATA,
request: signData!,
selectedAccount: address,
chainId: Provider.getById(providerId)?.ethChainId,
});
Alert.alert('Result', result, [
{text: 'Close'},
@@ -234,6 +243,13 @@ export const SettingsDeveloperTools = observer(() => {
variant={ButtonVariant.contained}
/>
<Spacer height={8} />
<Button
title="Clear"
disabled={!rawSignData}
onPress={() => setRawSignData('')}
variant={ButtonVariant.second}
/>
<Spacer height={8} />
<Title text="WalletConnect" />
<Input
placeholder="wc:"
Original file line number Diff line number Diff line change
@@ -486,7 +486,11 @@ export const JsonRpcMethodsHandlers: Record<string, JsonRpcMethodHandler> = {

const wallet = Wallet.getById(address);
if (wallet) {
const walletProvider = await getProviderInstanceForWallet(wallet);
const walletProvider = await getProviderInstanceForWallet(
wallet,
false,
true,
);
const {publicKey} = await walletProvider.getAccountInfo(wallet.path!);

return {
6 changes: 5 additions & 1 deletion src/services/sign-json-rpc-request.ts
Original file line number Diff line number Diff line change
@@ -99,7 +99,11 @@ export class SignJsonRpcRequest {
throw new Error(getText(I18N.jsonRpcErrorInvalidWallet));
}

const instanceProvider = await getProviderInstanceForWallet(wallet);
const instanceProvider = await getProviderInstanceForWallet(
wallet,
false,
true,
);

if (!instanceProvider) {
throw new Error(getText(I18N.jsonRpcErrorInvalidProvider));