Replace signDigestWithEthers with signDigest from crypto module + other improvements

Makefile

@@ -188,7 +188,7 @@ test-cf: cf-core
 test-client: client
 	bash ops/test/client.sh
 
-test-contracts: contracts types
+test-contracts: contracts types crypto
 	bash ops/test/contracts.sh
 
 test-daicard:
@@ -285,12 +285,12 @@ test-runner-staging: node-modules client $(shell find $(tests)/src $(tests)/ops
 ########################################
 # JS & bundles
 
-client: cf-core types contracts apps messaging channel-provider $(shell find $(client)/src $(client)/tsconfig.json $(find_options))
+client: cf-core types crypto contracts store apps messaging channel-provider $(shell find $(client)/src $(client)/tsconfig.json $(find_options))
 	$(log_start)
 	$(docker_run) "cd modules/client && npm run build"
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-cf-core: node-modules types contracts crypto store $(shell find $(cf-core)/src $(cf-core)/test $(cf-core)/tsconfig.json $(find_options))
+cf-core: node-modules types crypto contracts store $(shell find $(cf-core)/src $(cf-core)/test $(cf-core)/tsconfig.json $(find_options))
 	$(log_start)
 	$(docker_run) "cd modules/cf-core && npm run build"
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
@@ -320,7 +320,7 @@ messaging: node-modules types $(shell find $(messaging)/src $(find_options))
 	$(docker_run) "cd modules/messaging && npm run build"
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-node: cf-core types contracts crypto apps messaging $(shell find $(node)/src $(node)/migrations $(find_options))
+node: cf-core types crypto contracts apps messaging $(shell find $(node)/src $(node)/migrations $(find_options))
 	$(log_start)
 	$(docker_run) "cd modules/node && npm run build && touch src/main.ts"
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
@@ -348,7 +348,7 @@ apps: node-modules types crypto cf-core $(shell find $(apps)/src $(find_options)
 ########################################
 # Common Prerequisites
 
-contracts: node-modules types contract-artifacts $(shell find $(contracts)/index.ts $(contracts)/test $(contracts)/tsconfig.json $(find_options))
+contracts: node-modules types crypto contract-artifacts $(shell find $(contracts)/index.ts $(contracts)/test $(contracts)/tsconfig.json $(find_options))
 	$(log_start)
 	$(docker_run) "cd modules/contracts && npm run transpile"
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@

modules/apps/src/HashLockTransferApp/convert.ts

@@ -13,7 +13,7 @@ export function convertHashLockTransferParameters<To extends NumericTypeName>(
   to: To,
   obj: HashLockTransferParameters<any>,
 ): HashLockTransferParameters<NumericTypes[To]> {
-  return convertFields(getType(obj.amount), to, ["timelock", "amount"], { ...obj })
+  return convertFields(getType(obj.amount), to, ["timelock", "amount"], { ...obj });
 }
 
 export function convertHashLockTransferAppState<To extends NumericTypeName>(

modules/apps/src/SimpleTwoPartySwapApp/convert.ts

@@ -5,7 +5,7 @@ import {
   SimpleSwapAppState,
   SwapParameters,
   makeChecksumOrEthAddress,
-  convertCoinTransfersToObjIfNeeded
+  convertCoinTransfersToObjIfNeeded,
 } from "@connext/types";
 
 export function convertSimpleSwapAppState<To extends NumericTypeName>(

modules/apps/src/WithdrawApp/convert.ts

@@ -1,12 +1,12 @@
 import {
-    NumericTypes,
-    convertAmountField,
-    NumericTypeName,
-    WithdrawAppState,
-    WithdrawParameters,
-    makeChecksumOrEthAddress,
-    convertCoinTransfersToObjIfNeeded
-  } from "@connext/types";
+  NumericTypes,
+  convertAmountField,
+  NumericTypeName,
+  WithdrawAppState,
+  WithdrawParameters,
+  makeChecksumOrEthAddress,
+  convertCoinTransfersToObjIfNeeded,
+} from "@connext/types";
 
 export function convertWithrawAppState<To extends NumericTypeName>(
   to: To,
@@ -15,10 +15,7 @@ export function convertWithrawAppState<To extends NumericTypeName>(
   obj.transfers = convertCoinTransfersToObjIfNeeded(obj.transfers);
   return {
     ...obj,
-    transfers: [
-      convertAmountField(to, obj.transfers[0]),
-      convertAmountField(to, obj.transfers[1]),
-    ],
+    transfers: [convertAmountField(to, obj.transfers[0]), convertAmountField(to, obj.transfers[1])],
   };
 }
 
@@ -29,7 +26,7 @@ export function convertWithdrawParameters<To extends NumericTypeName>(
   const asset: any = {
     ...obj,
     assetId: makeChecksumOrEthAddress(obj.assetId),
-    recipient: makeChecksumOrEthAddress(obj.recipient)
+    recipient: makeChecksumOrEthAddress(obj.recipient),
   };
   return convertAmountField(to, asset);
 }

modules/apps/src/WithdrawApp/registry.ts

@@ -1,4 +1,9 @@
-import { OutcomeType, WithdrawAppStateEncoding, WithdrawAppActionEncoding, WithdrawApp } from "@connext/types";
+import {
+  OutcomeType,
+  WithdrawAppStateEncoding,
+  WithdrawAppActionEncoding,
+  WithdrawApp,
+} from "@connext/types";
 
 import { AppRegistryInfo } from "../shared";
 

modules/apps/src/shared/validation.ts

@@ -1,4 +1,10 @@
-import { CFCoreTypes, stringify, bigNumberifyObj, CoinTransferBigNumber, CoinBalanceRefundApp } from "@connext/types";
+import {
+  CFCoreTypes,
+  stringify,
+  bigNumberifyObj,
+  CoinTransferBigNumber,
+  CoinBalanceRefundApp,
+} from "@connext/types";
 
 import { AppRegistryInfo } from "./registry";
 import { BigNumber } from "ethers/utils";

modules/cf-core/src/methods/app-instance/get-app-instance/controller.ts

@@ -24,11 +24,11 @@ export default class GetAppInstanceDetailsController extends NodeController {
     }
 
     //TODO - This is very dumb, just add multisigAddress to the base app instance type to begin with
-    let appInstance = (await store.getAppInstance(appInstanceId)).toJson()
-    appInstance.multisigAddress = (await store.getMultisigAddressFromAppInstance(appInstanceId))
+    let appInstance = (await store.getAppInstance(appInstanceId)).toJson();
+    appInstance.multisigAddress = await store.getMultisigAddressFromAppInstance(appInstanceId);
 
     return {
-      appInstance
+      appInstance,
     };
   }
 }

modules/cf-core/src/node.ts

@@ -7,6 +7,7 @@ import {
   AppInstanceProposal,
   PersistAppType,
 } from "@connext/types";
+import { signDigest } from "@connext/crypto";
 import { BaseProvider } from "ethers/providers";
 import { SigningKey } from "ethers/utils";
 import EventEmitter from "eventemitter3";
@@ -28,7 +29,7 @@ import {
   NodeMessageWrappedProtocolMessage,
   ProtocolMessage,
 } from "./types";
-import { timeout, signDigestWithEthers } from "./utils";
+import { timeout } from "./utils";
 import { Store } from "./store";
 import {
   ConditionalTransactionCommitment,
@@ -180,7 +181,7 @@ export class Node {
       const privateKey = await this.privateKeyGetter.getPrivateKey(keyIndex);
       const hash = commitment.hashToSign();
 
-      return signDigestWithEthers(privateKey, hash);
+      return await signDigest(privateKey, hash);
     });
 
     protocolRunner.register(Opcode.IO_SEND, async (args: [ProtocolMessage]) => {

modules/cf-core/src/protocol/utils/signature-validator.ts

@@ -1,7 +1,12 @@
-import { getAddress, recoverAddress, Signature } from "ethers/utils";
+import { getAddress, recoverAddress } from "ethers/utils";
+import { isHexString, addHexPrefix } from "@connext/crypto";
 
 import { EthereumCommitment } from "../../types";
 
+function sanitizeHexString(hex: string): string {
+  return isHexString(hex) ? addHexPrefix(hex) : hex;
+}
+
 export function assertIsValidSignature(
   expectedSigner: string,
   commitment?: EthereumCommitment,
@@ -18,7 +23,7 @@ export function assertIsValidSignature(
   const hash = commitment.hashToSign();
 
   // recoverAddress: 83 ms, hashToSign: 7 ms
-  const signer = recoverAddress(hash, signature);
+  const signer = recoverAddress(sanitizeHexString(hash), sanitizeHexString(signature));
 
   if (getAddress(expectedSigner) !== signer) {
     throw Error(