Replace signDigestWithEthers with signDigest from crypto module + other improvements

.github/workflows/cd-master.yml

@@ -58,6 +58,19 @@ jobs:
     - run: make contracts
     - run: make test-contracts
 
+  test-crypto:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Cache node modules
+      uses: actions/cache@v1
+      with:
+        path: .npm
+        key: npm-${{ hashFiles('package-lock.json') }}
+        restore-keys: npm-
+    - run: make crypto
+    - run: make test-crypto
+
   test-node:
     runs-on: ubuntu-latest
     steps:
@@ -138,7 +151,7 @@ jobs:
       INDRA_NATS_JWT_SIGNER_PUBLIC_KEY: ${{ secrets.INDRA_NATS_JWT_SIGNER_PUBLIC_KEY_RINKEBY }}
       RINKEBY_DOMAINNAME: rinkeby.indra.connext.network
       RINKEBY_ETH_PROVIDER: ${{ secrets.RINKEBY_ETH_PROVIDER }}
-    needs: [test-backwards-compatibility, test-cf, test-client, test-contracts, test-daicard, test-integration, test-node, test-ssh]
+    needs: [test-backwards-compatibility, test-cf, test-client, test-contracts, test-crypto, test-daicard, test-integration, test-node, test-ssh]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1

.github/workflows/cd-staging.yml

@@ -58,6 +58,19 @@ jobs:
     - run: make contracts
     - run: make test-contracts
 
+  test-crypto:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Cache node modules
+      uses: actions/cache@v1
+      with:
+        path: .npm
+        key: npm-${{ hashFiles('package-lock.json') }}
+        restore-keys: npm-
+    - run: make crypto
+    - run: make test-crypto
+
   test-node:
     runs-on: ubuntu-latest
     steps:
@@ -126,7 +139,7 @@ jobs:
       INDRA_NATS_JWT_SIGNER_PUBLIC_KEY: ${{ secrets.INDRA_NATS_JWT_SIGNER_PUBLIC_KEY_RINKEBY }}
       RINKEBY_ETH_PROVIDER: ${{ secrets.RINKEBY_ETH_PROVIDER }}
       STAGING_DOMAINNAME: staging.indra.connext.network
-    needs: [test-cf, test-client, test-contracts, test-daicard, test-integration, test-node, test-ssh]
+    needs: [test-cf, test-client, test-contracts, test-crypto, test-daicard, test-integration, test-node, test-ssh]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1

.github/workflows/cd-tests.yml

@@ -65,6 +65,19 @@ jobs:
     - run: make contracts
     - run: make test-contracts
 
+  test-crypto:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Cache node modules
+      uses: actions/cache@v1
+      with:
+        path: .npm
+        key: npm-${{ hashFiles('package-lock.json') }}
+        restore-keys: npm-
+    - run: make crypto
+    - run: make test-crypto
+
   test-node:
     runs-on: ubuntu-latest
     steps:
@@ -98,7 +111,7 @@ jobs:
     - uses: actions/checkout@v1
     - run: make pull-commit
     - run: make start-test-staging
-    - run: sleep 15 && make dls
+    - run: sleep 20 && make dls
     - run: make test-backwards-compatibility
     - name: Print node logs
       if: failure()

.github/workflows/ci-tests.yml

@@ -46,6 +46,19 @@ jobs:
     - run: make contracts
     - run: make test-contracts
 
+  test-crypto:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Cache node modules
+      uses: actions/cache@v1
+      with:
+        path: .npm
+        key: npm-${{ hashFiles('package-lock.json') }}
+        restore-keys: npm-
+    - run: make crypto
+    - run: make test-crypto
+
   test-integration:
     env:
       INDRA_ADMIN_TOKEN: ${{ secrets.INDRA_ADMIN_TOKEN }}

Makefile

@@ -188,9 +188,12 @@ test-cf: cf-core
 test-client: client
 	bash ops/test/client.sh
 
-test-contracts: contracts types
+test-contracts: contracts crypto
 	bash ops/test/contracts.sh
 
+test-crypto: crypto
+	bash ops/test/crypto.sh
+
 test-daicard:
 	bash ops/test/ui.sh daicard
 
@@ -285,16 +288,21 @@ 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))
+apps: node-modules crypto cf-core $(shell find $(apps)/src $(find_options))
 	$(log_start)
-	$(docker_run) "cd modules/client && npm run build"
+	$(docker_run) "cd modules/apps && 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 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)/$@
 
+client: 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)/$@
+
 channel-provider: node-modules types $(shell find $(channel-provider)/src $(find_options))
 	$(log_start)
 	$(docker_run) "cd modules/channel-provider && npm run build"
@@ -320,7 +328,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: 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)/$@
@@ -340,15 +348,10 @@ types: node-modules $(shell find $(types)/src $(find_options))
 	$(docker_run) "cd modules/types && npm run build"
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-apps: node-modules types crypto cf-core $(shell find $(apps)/src $(find_options))
-	$(log_start)
-	$(docker_run) "cd modules/apps && npm run build"
-	$(log_finish) && mv -f $(totalTime) $(flags)/$@
-
 ########################################
 # Common Prerequisites
 
-contracts: node-modules types contract-artifacts $(shell find $(contracts)/index.ts $(contracts)/test $(contracts)/tsconfig.json $(find_options))
+contracts: node-modules 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/WithdrawApp/validation.ts

@@ -4,14 +4,15 @@ import {
   CoinTransferBigNumber,
   bigNumberifyObj,
   WithdrawAppState,
+  recoverAddressWithEthers,
 } from "@connext/types";
 
 import { unidirectionalCoinTransferValidation } from "../shared";
 import { convertWithrawAppState } from "./convert";
-import { BigNumber, recoverAddress } from "ethers/utils";
+import { BigNumber } from "ethers/utils";
 import { HashZero, Zero } from "ethers/constants";
 
-export const validateWithdrawApp = (
+export const validateWithdrawApp = async (
   params: CFCoreTypes.ProposeInstallParams,
   initiatorPublicIdentifier: string,
   responderPublicIdentifier: string,
@@ -67,7 +68,7 @@ export const validateWithdrawApp = (
     );
   }
 
-  let recovered = recoverAddress(initialState.data, initialState.signatures[0]);
+  let recovered = await recoverAddressWithEthers(initialState.data, initialState.signatures[0]);
 
   if (recovered !== initialState.signers[0]) {
     throw new Error(

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/auto-nonce-wallet.ts

@@ -6,7 +6,7 @@ export default class AutoNonceWallet extends Wallet {
 
   async sendTransaction(tx: TransactionRequest): Promise<TransactionResponse> {
     if (!tx.nonce) {
-      if (this.noncePromise === undefined) {
+      if (typeof this.noncePromise === "undefined") {
         this.noncePromise = this.provider.getTransactionCount(this.address);
       }
 

modules/cf-core/src/ethereum/multisig-commitment.ts

@@ -1,8 +1,8 @@
 import { Interface, keccak256, solidityPack } from "ethers/utils";
+import { sortSignaturesBySignerAddress } from "@connext/types";
 
 import { MinimumViableMultisig } from "../contracts";
 import { CFCoreTypes, EthereumCommitment, MultisigTransaction } from "../types";
-import { sortSignaturesBySignerAddress } from "../utils";
 
 /// A commitment to make MinimumViableMultisig perform a message call
 export abstract class MultisigCommitment implements EthereumCommitment {
@@ -27,11 +27,11 @@ export abstract class MultisigCommitment implements EthereumCommitment {
     this.participantSignatures = sigs;
   }
 
-  public getSignedTransaction(): CFCoreTypes.MinimalTransaction {
+  public async getSignedTransaction(): Promise<CFCoreTypes.MinimalTransaction> {
     this.assertSignatures();
     const multisigInput = this.getTransactionDetails();
     const hash = this.hashToSign();
-    const signaturesList = sortSignaturesBySignerAddress(hash, this.signatures);
+    const signaturesList = await sortSignaturesBySignerAddress(hash, this.signatures);
 
     const txData = new Interface(MinimumViableMultisig.abi).functions.execTransaction.encode([
       multisigInput.to,

modules/cf-core/src/ethereum/set-state-commitment.ts

@@ -1,4 +1,5 @@
 import { Interface, keccak256, solidityPack } from "ethers/utils";
+import { sortSignaturesBySignerAddress } from "@connext/types";
 
 import { ChallengeRegistry } from "../contracts";
 import {
@@ -8,7 +9,6 @@ import {
   SignedStateHashUpdate,
   SetStateCommitmentJSON,
 } from "../types";
-import { sortSignaturesBySignerAddress } from "../utils";
 
 import { appIdentityToHash } from "./utils";
 
@@ -55,12 +55,15 @@ export class SetStateCommitment implements EthereumCommitment {
     return keccak256(this.encode());
   }
 
-  public getSignedTransaction(): CFCoreTypes.MinimalTransaction {
+  public async getSignedTransaction(): Promise<CFCoreTypes.MinimalTransaction> {
     this.assertSignatures();
     return {
       to: this.challengeRegistryAddress,
       value: 0,
-      data: iface.functions.setState.encode([this.appIdentity, this.getSignedStateHashUpdate()]),
+      data: iface.functions.setState.encode([
+        this.appIdentity,
+        await this.getSignedStateHashUpdate(),
+      ]),
     };
   }
 
@@ -88,14 +91,14 @@ export class SetStateCommitment implements EthereumCommitment {
     );
   }
 
-  private getSignedStateHashUpdate(): SignedStateHashUpdate {
+  private async getSignedStateHashUpdate(): Promise<SignedStateHashUpdate> {
     this.assertSignatures();
     const hash = this.hashToSign();
     return {
       appStateHash: this.appStateHash,
       versionNumber: this.versionNumber,
       timeout: this.timeout,
-      signatures: sortSignaturesBySignerAddress(hash, this.signatures),
+      signatures: await sortSignaturesBySignerAddress(hash, this.signatures),
     };
   }
 

modules/cf-core/src/machine/middleware.ts

@@ -18,8 +18,8 @@ export class MiddlewareContainer {
   public async run(opCode: Opcode, args: any[]) {
     const middleware = this.middlewares[opCode][0];
 
-    if (middleware === undefined) {
-      throw Error(`Attempted to run middleware for opcode ${opCode} but none existed`);
+    if (typeof middleware === "undefined") {
+      throw new Error(`Attempted to run middleware for opcode ${opCode} but none existed`);
     }
 
     return middleware(args);

modules/cf-core/src/machine/protocol-runner.ts

@@ -50,7 +50,7 @@ function firstRecipientFromProtocolName(protocolName: Protocol) {
   ) {
     return "responderXpub";
   }
-  throw Error(`Unknown protocolName ${protocolName} passed to firstRecipientFromProtocolName`);
+  throw new Error(`Unknown protocolName ${protocolName} passed to firstRecipientFromProtocolName`);
 }
 
 export class ProtocolRunner {
@@ -76,8 +76,8 @@ export class ProtocolRunner {
   public async runProtocolWithMessage(msg: ProtocolMessage) {
     const protocol = getProtocolFromName(msg.protocol);
     const step = protocol[msg.seq];
-    if (step === undefined) {
-      throw Error(`Received invalid seq ${msg.seq} for protocol ${msg.protocol}`);
+    if (typeof step === "undefined") {
+      throw new Error(`Received invalid seq ${msg.seq} for protocol ${msg.protocol}`);
     }
     return this.runProtocol(step, msg);
   }