Merge pull request #1392 from joincivil/dankins/another-newsroom-sign…

…up-fix fix(ethapi): use web.eth.personal.sign instead of raw rpc
joincivil · Aug 29, 2019 · f1285aa · f1285aa
2 parents d9ecc9a + a95dabe
commit f1285aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/core/src/contracts/newsroom.ts b/packages/core/src/contracts/newsroom.ts
@@ -135,7 +135,7 @@ export class Newsroom extends BaseWrapper<NewsroomContract> {
       throw new Error("No Newsroom created during deployment through factory");
     }
 
-    const contract = NewsroomContract.atUntrusted(ethApi, createdNewsroom.returnValues.instantiation);
+    const contract = NewsroomContract.atUntrusted(ethApi, createdNewsroom.args.instantiation);
     const multisigProxy = await NewsroomMultisigProxy.create(ethApi, contract);
     const defaultBlock = getDefaultFromBlock(await ethApi.network());
     return new Newsroom(ethApi, contentProvider, contract, multisigProxy, defaultBlock);

diff --git a/packages/ethapi/src/ethapi.ts b/packages/ethapi/src/ethapi.ts
@@ -187,7 +187,8 @@ export class EthApi {
     const signerAccount = account || (await requireAccount(this).toPromise());
     let signature: Hex;
     try {
-      signature = (await this.rpc("personal_sign", messageHex, signerAccount, "")).result;
+      // @ts-ignore types are wrong on personal sign
+      signature = await this.web3.eth.personal.sign(messageHex, signerAccount);
     } catch (e) {
       if (e.message.toLowerCase().includes("user denied")) {
         throw e; // rethrow the metamask error to be handled in ui