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.

Sign up for GitHub

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

Jump to bottom

onScan find Address in Store with Appropriate Prefix #349

Merged
merged 4 commits into from
Sep 2, 2019
Merged

onScan find Address in Store with Appropriate Prefix #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ccdd028
feat: encode to network prefix based on genesis hash
pmespresso Sep 2, 2019
af65394
fix: try other encoding of address on scan
pmespresso Sep 2, 2019
a7dcf02
fix: grumble
pmespresso Sep 2, 2019
8f7dffb
fix: get prefix from constants
pmespresso Sep 2, 2019
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
17 changes: 16 additions & 1 deletion src/stores/ScannerStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
// @flow
import { GenericExtrinsicPayload } from '@polkadot/types';
import { hexStripPrefix, isU8a, u8aToHex } from '@polkadot/util';
import { checkAddress, decodeAddress, encodeAddress } from '@polkadot/util-crypto';
import { Container } from 'unstated';

import { NETWORK_LIST, NetworkProtocols } from '../constants';
import { NETWORK_LIST, NetworkProtocols, SUBSTRATE_NETWORK_LIST } from '../constants';
import { saveTx } from '../util/db';
import { isAscii } from '../util/message';
import { blake2s, brainWalletSign, decryptData, keccak, ethSign, substrateSign } from '../util/native';
Expand Down Expand Up @@ -81,6 +82,20 @@ export default class ScannerStore extends Container<ScannerState> {
async setParsedData(strippedData, accountsStore) {
const parsedData = await constructDataFromBytes(strippedData);

if (!accountsStore.getByAddress(parsedData.data.account)) {
let networks = Object.keys(SUBSTRATE_NETWORK_LIST);

for (let i = 0; i < networks.length; i++) {
let key = networks[i];
let account = accountsStore.getByAddress(encodeAddress(decodeAddress(parsedData.data.account), SUBSTRATE_NETWORK_LIST[key].prefix));

if (account) {
parsedData['data']['account'] = account.address;
break;
}
}
}

if (parsedData.isMultipart) {
this.setPartData(parseData.frame, parsedData.frameCount, parseData.partData, accountsStore);
return;
Expand Down
35 changes: 26 additions & 9 deletions src/util/decoders.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ import {
u8aToHex,
u8aToString
} from '@polkadot/util';
import { encodeAddress } from '@polkadot/util-crypto';
import { encodeAddress, checkAddress } from '@polkadot/util-crypto';

import { blake2s, keccak } from './native';
import { blake2s } from './native';
import { NETWORK_LIST, SUBSTRATE_NETWORK_LIST, SubstrateNetworkKeys } from '../constants';

/*
Example Full Raw Data
Expand Down Expand Up @@ -143,38 +144,53 @@ export async function constructDataFromBytes(bytes) {
case '53': // Substrate UOS payload
try {
const crypto = firstByte === '00' ? 'ed25519' : firstByte === '01' ? 'sr25519' : null;
data['data']['crypto'] = crypto;

const pubKeyHex = uosAfterFrames.substr(6, 64)
const publicKeyAsBytes = hexToU8a('0x' + pubKeyHex);
const ss58Encoded = encodeAddress(publicKeyAsBytes, 2); // encode to kusama
const hexEncodedData = '0x' + uosAfterFrames.slice(70);
const rawPayload = hexToU8a(hexEncodedData);

const isOversized = rawPayload.length > 256;

data['data']['crypto'] = crypto;
data['data']['account'] = ss58Encoded;
const defaultPrefix = SUBSTRATE_NETWORK_LIST[SubstrateNetworkKeys.KUSAMA].prefix;
let extrinsicPayload;
let network;

switch (secondByte) {
case '00': // sign mortal extrinsic
extrinsicPayload = new GenericExtrinsicPayload(rawPayload, { version: 3 });

data['action'] = isOversized ? 'signData' : 'signTransaction';
data['oversized'] = isOversized;
data['isHash'] = isOversized;
data['data']['data'] = isOversized
? await blake2s(u8aToHex(rawPayload))
: new GenericExtrinsicPayload(rawPayload, { version: 3 });
: extrinsicPayload;

network = NETWORK_LIST[extrinsicPayload.genesisHash.toHex()];
data['data']['account'] = encodeAddress(publicKeyAsBytes, network.prefix); // encode to the prefix;

break;
case '01': // data is a hash
data['action'] = 'signData';
data['oversized'] = false;
data['isHash'] = true;
data['data']['data'] = rawPayload;
data['data']['account'] = encodeAddress(publicKeyAsBytes, defaultPrefix); // default to Kusama
break;
case '02': // immortal
extrinsicPayload = new GenericExtrinsicPayload(rawPayload, { version: 3 });

data['action'] = isOversized ? 'signData' : 'signTransaction';
data['oversized'] = isOversized;
data['isHash'] = isOversized;
data['data']['data'] = isOversized
? await blake2s(u8aToHex(rawPayload))
: new GenericExtrinsicPayload(rawPayload, { version: 3 });
: extrinsicPayload;

network = NETWORK_LIST[extrinsicPayload.genesisHash.toHex()];
data['data']['account'] = encodeAddress(publicKeyAsBytes, network.prefix); // encode to the prefix;

break;
case '03': // Cold Signer should attempt to decode message to utf8
data['action'] = 'signData';
Expand All @@ -183,6 +199,7 @@ export async function constructDataFromBytes(bytes) {
data['data']['data'] = isOversized
? await blake2s(u8aToHex(rawPayload))
: u8aToString(rawPayload);
data['data']['account'] = encodeAddress(publicKeyAsBytes, defaultPrefix); // default to Kusama
break;
default:
break;
Expand Down