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

Enable passing a json object for wallet json. #3117

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable passing a json object for wallet json. #3117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/json-wallets/src.ts/crowdsale.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ export class CrowdsaleAccount extends Description<_CrowdsaleAccount> implements
}

// See: https://github.com/ethereum/pyethsaletool
export function decrypt(json: string, password: Bytes | string): ExternallyOwnedAccount {
const data = JSON.parse(json);
export function decrypt(json: string | object, password: Bytes | string): ExternallyOwnedAccount {
const data = typeof json === 'object' ? json : JSON.parse(json);

password = getPassword(password);

Expand Down
2 changes: 1 addition & 1 deletion packages/json-wallets/src.ts/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function decryptJsonWallet(json: string, password: Bytes | string, progressCallb
return Promise.reject(new Error("invalid JSON wallet"));
}

function decryptJsonWalletSync(json: string, password: Bytes | string): ExternallyOwnedAccount {
function decryptJsonWalletSync(json: string | object, password: Bytes | string): ExternallyOwnedAccount {
if (isCrowdsaleWallet(json)) {
return decryptCrowdsale(json, password)
}
Expand Down
14 changes: 7 additions & 7 deletions packages/json-wallets/src.ts/inspect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
import { getAddress } from "@ethersproject/address";


export function isCrowdsaleWallet(json: string): boolean {
export function isCrowdsaleWallet(json: string | object): boolean {
let data: any = null;
try {
data = JSON.parse(json);
data = typeof json === 'object' ? json : JSON.parse(json);
} catch (error) { return false; }

return (data.encseed && data.ethaddr);
}

export function isKeystoreWallet(json: string): boolean {
export function isKeystoreWallet(json: string | object): boolean {
let data: any = null;
try {
data = JSON.parse(json);
data = typeof json === 'object' ? json : JSON.parse(json);
} catch (error) { return false; }

if (!data.version || parseInt(data.version) !== data.version || parseInt(data.version) !== 3) {
Expand All @@ -30,16 +30,16 @@ export function isKeystoreWallet(json: string): boolean {
// return (isSecretStorageWallet(json) || isCrowdsaleWallet(json));
//}

export function getJsonWalletAddress(json: string): string {
export function getJsonWalletAddress(json: string | object): string {
if (isCrowdsaleWallet(json)) {
try {
return getAddress(JSON.parse(json).ethaddr);
return getAddress(json.ethaddr ?? JSON.parse(json).ethaddr);
} catch (error) { return null; }
}

if (isKeystoreWallet(json)) {
try {
return getAddress(JSON.parse(json).address);
return getAddress(json.address ?? JSON.parse(json).address);
} catch (error) { return null; }
}

Expand Down
8 changes: 4 additions & 4 deletions packages/json-wallets/src.ts/keystore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,15 +209,15 @@ function _computeKdfKey<T>(data: any, password: Bytes | string, pbkdf2Func: Pbkd
}


export function decryptSync(json: string, password: Bytes | string): KeystoreAccount {
const data = JSON.parse(json);
export function decryptSync(json: string | object, password: Bytes | string): KeystoreAccount {
const data = typeof json === 'object' ? json : JSON.parse(json);

const key = _computeKdfKey(data, password, pbkdf2Sync, scrypt.syncScrypt);
return _getAccount(data, key);
}

export async function decrypt(json: string, password: Bytes | string, progressCallback?: ProgressCallback): Promise<KeystoreAccount> {
const data = JSON.parse(json);
export async function decrypt(json: string | object, password: Bytes | string, progressCallback?: ProgressCallback): Promise<KeystoreAccount> {
const data = typeof json === 'object' ? json : JSON.parse(json);

const key = await _computeKdfKey(data, password, pbkdf2, scrypt.scrypt, progressCallback);
return _getAccount(data, key);
Expand Down