aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts/blockchain.ts
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-02-08 03:58:19 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-02-08 03:58:19 +0800
commit8fba0477a69317c19b3446c76a17cb3adbf447d7 (patch)
tree7c0cc8f53f1c9e7fe7f5f6d3d1f7b8249edbdaa7 /packages/website/ts/blockchain.ts
parente6f2c7a382e2e7e940f430f350240cb2f703bdcd (diff)
downloaddexon-sol-tools-8fba0477a69317c19b3446c76a17cb3adbf447d7.tar
dexon-sol-tools-8fba0477a69317c19b3446c76a17cb3adbf447d7.tar.gz
dexon-sol-tools-8fba0477a69317c19b3446c76a17cb3adbf447d7.tar.bz2
dexon-sol-tools-8fba0477a69317c19b3446c76a17cb3adbf447d7.tar.lz
dexon-sol-tools-8fba0477a69317c19b3446c76a17cb3adbf447d7.tar.xz
dexon-sol-tools-8fba0477a69317c19b3446c76a17cb3adbf447d7.tar.zst
dexon-sol-tools-8fba0477a69317c19b3446c76a17cb3adbf447d7.zip
Remove hash from signatureData
Diffstat (limited to 'packages/website/ts/blockchain.ts')
-rw-r--r--packages/website/ts/blockchain.ts13
1 files changed, 5 insertions, 8 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 099efb405..697ff4f10 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -2,6 +2,7 @@ import {
BlockParam,
BlockRange,
DecodedLogEvent,
+ ECSignature,
ExchangeContractEventArgs,
ExchangeEvents,
IndexedFilterValues,
@@ -299,10 +300,9 @@ export class Blockchain {
takerFee: BigNumber,
expirationUnixTimestampSec: BigNumber,
feeRecipient: string,
- signatureData: SignatureData,
+ ecSignature: ECSignature,
salt: BigNumber,
): SignedOrder {
- const ecSignature = signatureData;
const exchangeContractAddress = this.getExchangeContractAddressIfExists();
const takerOrNullAddress = _.isEmpty(taker) ? constants.NULL_ADDRESS : taker;
const signedOrder = {
@@ -413,7 +413,7 @@ export class Blockchain {
return newTokenBalancePromise;
}
- public async signOrderHashAsync(orderHash: string): Promise<SignatureData> {
+ public async signOrderHashAsync(orderHash: string): Promise<ECSignature> {
utils.assert(!_.isUndefined(this._zeroEx), 'ZeroEx must be instantiated.');
const makerAddress = this._userAddress;
// If makerAddress is undefined, this means they have a web3 instance injected into their browser
@@ -436,11 +436,8 @@ export class Blockchain {
makerAddress,
shouldAddPersonalMessagePrefix,
);
- const signatureData = _.extend({}, ecSignature, {
- hash: orderHash,
- });
- this._dispatcher.updateSignatureData(signatureData);
- return signatureData;
+ this._dispatcher.updateECSignature(ecSignature);
+ return ecSignature;
}
public async mintTestTokensAsync(token: Token) {
utils.assert(this._doesUserAddressExist(), BlockchainCallErrs.UserHasNoAssociatedAddresses);