Use @noble/secp256k1 (#1189)
* Use @noble/secp256k1 * Remove elliptic * Remove @types * -19 * verify uses recover internally * fromSeed * Init Noble utils inside cryptoInit * remove bn.js dep (used from @polkadot/util) * With x-noble-secp256k1 * Adjust * Remove unused functions * CHANGELOG * Fix useless assignment * Cleanup cryptoInit * adjust hasher * bn.js only via util * align versions * Remove x-secp256k1 (to be pulled in from master merge) * Remove (now) invalid test * Remove assertBigInt * hasBigInt * cleanups * Apply suggestions from code review * evmAddress fixes * Extra comment
This commit is contained in:
@@ -5,9 +5,9 @@ import type { HexString } from '@polkadot/util/types';
|
||||
import type { HashType } from '../secp256k1/types';
|
||||
import type { Prefix } from './types';
|
||||
|
||||
import { u8aConcat } from '@polkadot/util';
|
||||
import { assert, u8aConcat } from '@polkadot/util';
|
||||
|
||||
import { secp256k1Hasher } from '../secp256k1/hasher';
|
||||
import { hasher } from '../secp256k1/hasher';
|
||||
import { encodeAddress } from './encode';
|
||||
|
||||
/**
|
||||
@@ -15,15 +15,9 @@ import { encodeAddress } from './encode';
|
||||
* @summary Converts an EVM address to its corresponding SS58 address.
|
||||
*/
|
||||
export function evmToAddress (evmAddress: HexString | string | Uint8Array, ss58Format?: Prefix, hashType: HashType = 'blake2'): string {
|
||||
const wrapError = (message: string) => `Converting ${evmAddress as string}: ${message}`;
|
||||
|
||||
const message = u8aConcat('evm:', evmAddress);
|
||||
|
||||
if (message.length !== 24) {
|
||||
throw new Error(wrapError('Invalid evm address length'));
|
||||
}
|
||||
assert(message.length === 24, () => `Converting ${evmAddress as string}: Invalid evm address length`);
|
||||
|
||||
const address = secp256k1Hasher(hashType, message);
|
||||
|
||||
return encodeAddress(address, ss58Format);
|
||||
return encodeAddress(hasher(hashType, message), ss58Format);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user