toEthereumAddress

jshuo · Jun 25, 2024 · deaa2a7 · deaa2a7
1 parent f68988f
commit deaa2a7
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 41 deletions.
diff --git a/lib/index.cjs b/lib/index.cjs
@@ -5,7 +5,6 @@ var bytes = require('@ethersproject/bytes');
 var basex = require('@ethersproject/basex');
 var strings = require('@ethersproject/strings');
 var ethrDidResolver = require('ethr-did-resolver');
-var crypto = require('crypto');
 var elliptic = require('elliptic');
 
 function _interopNamespace(e) {
@@ -28,12 +27,6 @@ function _interopNamespace(e) {
 
 var base64__namespace = /*#__PURE__*/_interopNamespace(base64);
 
-// Function to compute Ethereum address from public key
-function computeAddress(publicKey) {
-  const hash = crypto.createHash('sha256').update(publicKey.slice(2), 'hex').digest();
-  const address = crypto.createHash('rmd160').update(hash).digest('hex');
-  return `0x${address}`;
-}
 exports.DelegateTypes = void 0;
 (function (DelegateTypes) {
   DelegateTypes["veriKey"] = "veriKey";
@@ -87,7 +80,7 @@ class EthrDID {
     const privateKey = '736f625c9dda78a94bb16840c82779bb7bc18014b8ede52f0f03429902fc4ba8';
     const key = ec.keyFromPrivate(privateKey);
     const publicKey = key.getPublic().encode("hex", false);
-    const address = computeAddress(publicKey);
+    const address = didJwt.toEthereumAddress(publicKey);
     const net = typeof chainNameOrId === 'number' ? bytes.hexValue(chainNameOrId) : chainNameOrId;
     const identifier = net ? `did:ethr:${net}:${publicKey}` : publicKey;
     return {

diff --git a/lib/index.cjs.map b/lib/index.cjs.map
diff --git a/lib/index.d.ts.map b/lib/index.d.ts.map
diff --git a/lib/index.module.js b/lib/index.module.js
diff --git a/lib/index.module.js.map b/lib/index.module.js.map
diff --git a/lib/index.umd.js b/lib/index.umd.js
diff --git a/lib/index.umd.js.map b/lib/index.umd.js.map
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,4 @@
-import { createJWT, ES256KSigner, ES256Signer, hexToBytes, JWTVerified, Signer as JWTSigner, verifyJWT } from 'did-jwt'
+import { createJWT, ES256KSigner, ES256Signer, hexToBytes, JWTVerified, Signer as JWTSigner, verifyJWT, toEthereumAddress } from 'did-jwt'
 import { Signer as TxSigner } from '@ethersproject/abstract-signer'
 import { CallOverrides } from '@ethersproject/contracts'
 import { Provider } from '@ethersproject/providers'
@@ -9,14 +9,7 @@ import { Base58 } from '@ethersproject/basex'
 import { toUtf8Bytes } from '@ethersproject/strings'
 import { EthrDidController, interpretIdentifier, MetaSignature, REGISTRY } from 'ethr-did-resolver'
 import { Resolvable } from 'did-resolver'
-import { createHash } from 'crypto';
 import { ec as EC } from 'elliptic';
-// Function to compute Ethereum address from public key
-function computeAddress(publicKey: string): string {
-  const hash = createHash('sha256').update(publicKey.slice(2), 'hex').digest();
-  const address = createHash('rmd160').update(hash).digest('hex');
-  return `0x${address}`;
-}
 
 export enum DelegateTypes {
   veriKey = 'veriKey',
@@ -110,7 +103,7 @@ export class EthrDID {
       '736f625c9dda78a94bb16840c82779bb7bc18014b8ede52f0f03429902fc4ba8';
     const key = ec.keyFromPrivate(privateKey);
     const publicKey = key.getPublic().encode("hex", false);
-    const address = computeAddress(publicKey)
+    const address = toEthereumAddress(publicKey)
     const net = typeof chainNameOrId === 'number' ? hexValue(chainNameOrId) : chainNameOrId
     const identifier = net ? `did:ethr:${net}:${publicKey}` : publicKey
     return { address, privateKey, publicKey, identifier }