Merge pull request #1102 from 0xProject/feature/0x.js/eip712-sign-typed-data

[0x.js][order-utils][web3-wrapper] Expose eth_signTypedData functionality for order signing

1 files changed, 11 insertions, 19 deletions

diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index c420bbf3a..b1181e4c6 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -9,11 +9,12 @@ import {
     ExchangeFillEventArgs,
     IndexedFilterValues,
 } from '@0xproject/contract-wrappers';
-import { assetDataUtils, orderHashUtils, signatureUtils, SignerType } from '@0xproject/order-utils';
+import { assetDataUtils, orderHashUtils, signatureUtils } from '@0xproject/order-utils';
 import { EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared';
 import {
     ledgerEthereumBrowserClientFactoryAsync,
     LedgerSubprovider,
+    MetamaskSubprovider,
     RedundantSubprovider,
     RPCSubprovider,
     SignerSubprovider,
@@ -27,8 +28,6 @@ import * as _ from 'lodash';
 import * as moment from 'moment';
 import * as React from 'react';
 import contract = require('truffle-contract');
-import { tokenAddressOverrides } from 'ts/utils/token_address_overrides';
-
 import { BlockchainWatcher } from 'ts/blockchain_watcher';
 import { AssetSendCompleted } from 'ts/components/flash_messages/asset_send_completed';
 import { TransactionSubmitted } from 'ts/components/flash_messages/transaction_submitted';
@@ -54,6 +53,7 @@ import { backendClient } from 'ts/utils/backend_client';
 import { configs } from 'ts/utils/configs';
 import { constants } from 'ts/utils/constants';
 import { errorReporter } from 'ts/utils/error_reporter';
+import { tokenAddressOverrides } from 'ts/utils/token_address_overrides';
 import { utils } from 'ts/utils/utils';
 import FilterSubprovider = require('web3-provider-engine/subproviders/filters');
 
@@ -161,7 +161,13 @@ export class Blockchain {
             // We catch all requests involving a users account and send it to the injectedWeb3
             // instance. All other requests go to the public hosted node.
             const provider = new Web3ProviderEngine();
-            provider.addProvider(new SignerSubprovider(injectedWeb3.currentProvider));
+            const providerName = this._getNameGivenProvider(injectedWeb3.currentProvider);
+            // Wrap Metamask in a compatability wrapper MetamaskSubprovider (to handle inconsistencies)
+            const signerSubprovider =
+                providerName === Providers.Metamask
+                    ? new MetamaskSubprovider(injectedWeb3.currentProvider)
+                    : new SignerSubprovider(injectedWeb3.currentProvider);
+            provider.addProvider(signerSubprovider);
             provider.addProvider(new FilterSubprovider());
             const rpcSubproviders = _.map(publicNodeUrlsIfExistsForNetworkId, publicNodeUrl => {
                 return new RPCSubprovider(publicNodeUrl);
@@ -432,21 +438,7 @@ export class Blockchain {
         }
         this._showFlashMessageIfLedger();
         const provider = this._contractWrappers.getProvider();
-        const isLedgerSigner = !_.isUndefined(this._ledgerSubprovider);
-        const injectedProvider = Blockchain._getInjectedWeb3().currentProvider;
-        const isMetaMaskSigner = utils.getProviderType(injectedProvider) === Providers.Metamask;
-        let signerType = SignerType.Default;
-        if (isLedgerSigner) {
-            signerType = SignerType.Ledger;
-        } else if (isMetaMaskSigner) {
-            signerType = SignerType.Metamask;
-        }
-        const ecSignatureString = await signatureUtils.ecSignOrderHashAsync(
-            provider,
-            orderHash,
-            makerAddress,
-            signerType,
-        );
+        const ecSignatureString = await signatureUtils.ecSignHashAsync(provider, orderHash, makerAddress);
         this._dispatcher.updateSignature(ecSignatureString);
         return ecSignatureString;
     }