diff options
author | Jacob Evans <jacob@dekz.net> | 2018-08-09 10:24:52 +0800 |
---|---|---|
committer | Jacob Evans <jacob@dekz.net> | 2018-08-11 16:27:21 +0800 |
commit | ca4905c3436931684d113ec66882836a4d0b265b (patch) | |
tree | 75edee08dcef867185a0fec7f590f3f79a601ba2 /packages/order-utils/src/order_factory.ts | |
parent | 5d4dd406f2946b43377049d7422c72b433bc64ab (diff) | |
download | dexon-sol-tools-ca4905c3436931684d113ec66882836a4d0b265b.tar dexon-sol-tools-ca4905c3436931684d113ec66882836a4d0b265b.tar.gz dexon-sol-tools-ca4905c3436931684d113ec66882836a4d0b265b.tar.bz2 dexon-sol-tools-ca4905c3436931684d113ec66882836a4d0b265b.tar.lz dexon-sol-tools-ca4905c3436931684d113ec66882836a4d0b265b.tar.xz dexon-sol-tools-ca4905c3436931684d113ec66882836a4d0b265b.tar.zst dexon-sol-tools-ca4905c3436931684d113ec66882836a4d0b265b.zip |
Rename from SignerProviderType.EthSign to SignerType.Default
Diffstat (limited to 'packages/order-utils/src/order_factory.ts')
-rw-r--r-- | packages/order-utils/src/order_factory.ts | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/packages/order-utils/src/order_factory.ts b/packages/order-utils/src/order_factory.ts index bd6bb84b8..4a6f3924b 100644 --- a/packages/order-utils/src/order_factory.ts +++ b/packages/order-utils/src/order_factory.ts @@ -1,4 +1,4 @@ -import { Order, SignedOrder, SignerProviderType } from '@0xproject/types'; +import { Order, SignedOrder, SignerType } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import { Provider } from 'ethereum-types'; import * as _ from 'lodash'; @@ -58,12 +58,11 @@ export const orderFactory = { createOrderOpts, ); const orderHash = orderHashUtils.getOrderHashHex(order); - const signature = await ecSignOrderHashAsync(provider, orderHash, makerAddress, SignerProviderType.EthSign); + const signature = await ecSignOrderHashAsync(provider, orderHash, makerAddress, SignerType.Default); const signedOrder: SignedOrder = _.assign(order, { signature }); return signedOrder; }, }; -<<<<<<< HEAD function generateDefaultCreateOrderOpts(): { takerAddress: string; @@ -84,18 +83,3 @@ function generateDefaultCreateOrderOpts(): { expirationTimeSeconds: constants.INFINITE_TIMESTAMP_SEC, }; } - -function getVRSHexString(ecSignature: ECSignature): string { - const ETH_SIGN_SIGNATURE_TYPE = '03'; - const vrs = `${intToHex(ecSignature.v)}${ethUtil.stripHexPrefix(ecSignature.r)}${ethUtil.stripHexPrefix( - ecSignature.s, - )}${ETH_SIGN_SIGNATURE_TYPE}`; - return vrs; -} - -function intToHex(i: number): string { - const hex = ethUtil.bufferToHex(ethUtil.toBuffer(i)); - return hex; -} -======= ->>>>>>> Introduce SignerProviderType |