Merge pull request #90 from initia-labs/feat/ethsecp256k1

Add eth option for mnemonic and raw key

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@initia/initia.js",
-  "version": "0.2.19",
+  "version": "0.2.20",
   "description": "The JavaScript SDK for Initia",
   "license": "Apache-2.0",
   "author": "Initia Foundation",

src/key/MnemonicKey.ts

@@ -24,12 +24,18 @@ interface MnemonicKeyOptions {
    * Coin type. Default is INIT, 118.
    */
   coinType?: number
+
+  /**
+   * Whether to use eth pubkey
+   */
+  eth?: boolean
 }
 
 const DEFAULT_OPTIONS = {
   account: 0,
   index: 0,
   coinType: INIT_COIN_TYPE,
+  eth: false,
 }
 
 /**
@@ -66,7 +72,7 @@ export class MnemonicKey extends RawKey {
    * @param options
    */
   constructor(options: MnemonicKeyOptions = {}) {
-    const { account, index, coinType } = {
+    const { account, index, coinType, eth } = {
       ...DEFAULT_OPTIONS,
       ...options,
     }
@@ -84,7 +90,7 @@ export class MnemonicKey extends RawKey {
       throw new Error('Failed to derive key pair')
     }
 
-    super(privateKey)
+    super(privateKey, eth)
     this.mnemonic = mnemonic
   }
 }

src/key/RawKey.ts

@@ -1,7 +1,7 @@
 import { SHA256, Word32Array } from 'jscrypto'
 import * as secp256k1 from 'secp256k1'
 import { Key } from './Key'
-import { SimplePublicKey } from '../core'
+import { EthPublicKey, SimplePublicKey } from '../core'
 import keccak256 from 'keccak256'
 
 /**
@@ -13,12 +13,21 @@ export class RawKey extends Key {
    */
   public privateKey: Buffer
 
-  constructor(privateKey: Buffer) {
+  constructor(
+    privateKey: Buffer,
+    public eth = false
+  ) {
     const publicKey = secp256k1.publicKeyCreate(
       new Uint8Array(privateKey),
       true
     )
-    super(new SimplePublicKey(Buffer.from(publicKey).toString('base64')))
+
+    if (eth) {
+      super(new EthPublicKey(Buffer.from(publicKey).toString('base64')))
+    } else {
+      super(new SimplePublicKey(Buffer.from(publicKey).toString('base64')))
+    }
+
     this.privateKey = privateKey
   }
 
@@ -30,6 +39,8 @@ export class RawKey extends Key {
 
   // eslint-disable-next-line @typescript-eslint/require-await
   public async sign(payload: Buffer): Promise<Buffer> {
+    if (this.eth) return this.signWithKeccak256(payload)
+
     const hash = Buffer.from(
       SHA256.hash(new Word32Array(payload)).toString(),
       'hex'