@toruslabs/ethereum-controllers 5.5.0 → 5.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/ethereum-controllers",
-  "version": "5.5.0",
+  "version": "5.5.2",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "main": "dist/ethereumControllers.cjs.js",
@@ -24,7 +24,7 @@
     "@ethereumjs/util": "^9.0.2",
     "@metamask/eth-sig-util": "^7.0.1",
     "@metamask/rpc-errors": "^6.1.0",
-    "@toruslabs/base-controllers": "^5.5.0",
+    "@toruslabs/base-controllers": "^5.5.1",
     "@toruslabs/http-helpers": "^6.0.0",
     "@toruslabs/openlogin-jrpc": "^7.0.0",
     "async-mutex": "^0.4.1",
@@ -64,7 +64,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bf6f09bf4354a511adf6f8fbb5eea94ddddcdb40",
+  "gitHead": "ba6a8e2124bfe47b5d75a27cda6492a46e09d59d",
   "devDependencies": {
     "@nomicfoundation/hardhat-toolbox": "^4.0.0",
     "hardhat": "^2.19.5"

package/src/Block/PollingBlockTracker.ts

@@ -1,5 +1,5 @@
 import { BaseBlockTracker, PollingBlockTrackerConfig, timeout } from "@toruslabs/base-controllers";
-import { BlockParams } from "ethers";
+import { type BlockParams } from "ethers";
 import log from "loglevel";
 
 import { idleTimeTracker } from "../utils/helpers";

package/src/Keyring/KeyringController.ts

@@ -1,5 +1,5 @@
 import { TypedTransaction } from "@ethereumjs/tx";
-import { addHexPrefix, bigIntToBytes, ecsign, stripHexPrefix } from "@ethereumjs/util";
+import { bigIntToBytes, bytesToHex, ecsign, privateToAddress, privateToPublic, stripHexPrefix } from "@ethereumjs/util";
 import {
   concatSig,
   decrypt,
@@ -13,7 +13,6 @@ import {
   TypedMessage,
 } from "@metamask/eth-sig-util";
 import { BaseConfig, BaseKeyringController, IKeyringController, KeyringControllerState } from "@toruslabs/base-controllers";
-import { SigningKey, Wallet } from "ethers";
 
 export default class KeyringController extends BaseKeyringController<Partial<BaseConfig>, KeyringControllerState> implements IKeyringController {
   constructor({ config, state }: { config: Partial<BaseConfig>; state: Partial<KeyringControllerState> }) {
@@ -36,10 +35,10 @@ export default class KeyringController extends BaseKeyringController<Partial<Bas
   }
 
   importAccount(accountPrivateKey: string): string {
-    const hexPrivateKey = addHexPrefix(accountPrivateKey);
-    const signingKey = new SigningKey(hexPrivateKey);
-    const wallet = new Wallet(signingKey.privateKey);
-    const { address } = wallet;
+    const hexPrivateKey = accountPrivateKey.padStart(64, "0");
+    const bufferPrivKey = Buffer.from(hexPrivateKey, "hex");
+    const publicKey = bytesToHex(privateToPublic(bufferPrivKey));
+    const address = bytesToHex(privateToAddress(bufferPrivKey));
 
     const existingWallet = this.state.wallets.find((w) => w.address === address);
     if (existingWallet) return existingWallet.address;
@@ -48,7 +47,7 @@ export default class KeyringController extends BaseKeyringController<Partial<Bas
       wallets: [
         ...this.state.wallets,
         {
-          publicKey: signingKey.publicKey,
+          publicKey,
           privateKey: accountPrivateKey,
           address,
         },

package/src/Message/AddChainController.ts

@@ -34,7 +34,7 @@ export class AddChainController extends AbstractMessageController<AddChainMessag
     try {
       const msgObject = this.getMessage(messageId);
       await this.approveMessage(messageId, msgObject.messageParams);
-      this.addChain(msgObject.messageParams);
+      await this.addChain(msgObject.messageParams);
       this.updateMessage({ ...msgObject, rawSig: JSON.stringify(msgObject.messageParams) });
       this.setMessageStatus(messageId, MessageStatus.SIGNED);
       return null;