aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2018-08-02 06:08:17 +0800
committerBrandon Millman <brandon.millman@gmail.com>2018-08-02 11:47:59 +0800
commit7c864b81e0d958560e098ebd8bd241385e4aadff (patch)
tree8bb4f31eb6f427ffdf91a1cb8516ec91ec4b773d /packages
parent4f006fdc5c3cc24bb5d008f4c363d5225fe6728a (diff)
downloaddexon-0x-contracts-7c864b81e0d958560e098ebd8bd241385e4aadff.tar.gz
dexon-0x-contracts-7c864b81e0d958560e098ebd8bd241385e4aadff.tar.zst
dexon-0x-contracts-7c864b81e0d958560e098ebd8bd241385e4aadff.zip
Add createOrder with no signing to orderFactory
Diffstat (limited to 'packages')
-rw-r--r--packages/order-utils/CHANGELOG.json8
-rw-r--r--packages/order-utils/src/constants.ts1
-rw-r--r--packages/order-utils/src/order_factory.ts42
3 files changed, 45 insertions, 6 deletions
diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json
index a399f5ea1..7d9ca0a53 100644
--- a/packages/order-utils/CHANGELOG.json
+++ b/packages/order-utils/CHANGELOG.json
@@ -1,5 +1,13 @@
[
{
+ "version": "1.1.0-rc.2",
+ "changes": [
+ {
+ "note": "Added a synchronous `createOrder` method in `orderFactory`"
+ }
+ ]
+ },
+ {
"version": "1.0.1-rc.2",
"changes": [
{
diff --git a/packages/order-utils/src/constants.ts b/packages/order-utils/src/constants.ts
index bb7482184..92eb89d70 100644
--- a/packages/order-utils/src/constants.ts
+++ b/packages/order-utils/src/constants.ts
@@ -10,4 +10,5 @@ export const constants = {
ERC721_ASSET_DATA_MINIMUM_BYTE_LENGTH: 53,
SELECTOR_LENGTH: 4,
BASE_16: 16,
+ INFINITE_TIMESTAMP_SEC: new BigNumber(2524604400), // Close to infinite
};
diff --git a/packages/order-utils/src/order_factory.ts b/packages/order-utils/src/order_factory.ts
index 803cb82b1..4be7a1913 100644
--- a/packages/order-utils/src/order_factory.ts
+++ b/packages/order-utils/src/order_factory.ts
@@ -1,17 +1,17 @@
-import { ECSignature, SignedOrder } from '@0xproject/types';
+import { ECSignature, Order, SignedOrder } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import { Provider } from 'ethereum-types';
import * as ethUtil from 'ethereumjs-util';
import * as _ from 'lodash';
+import { constants } from './constants';
import { orderHashUtils } from './order_hash';
import { generatePseudoRandomSalt } from './salt';
import { ecSignOrderHashAsync } from './signature_utils';
import { MessagePrefixType } from './types';
export const orderFactory = {
- async createSignedOrderAsync(
- provider: Provider,
+ createOrder(
makerAddress: string,
takerAddress: string,
senderAddress: string,
@@ -24,10 +24,9 @@ export const orderFactory = {
exchangeAddress: string,
feeRecipientAddress: string,
expirationTimeSecondsIfExists?: BigNumber,
- ): Promise<SignedOrder> {
- const defaultExpirationUnixTimestampSec = new BigNumber(2524604400); // Close to infinite
+ ): Order {
const expirationTimeSeconds = _.isUndefined(expirationTimeSecondsIfExists)
- ? defaultExpirationUnixTimestampSec
+ ? constants.INFINITE_TIMESTAMP_SEC
: expirationTimeSecondsIfExists;
const order = {
makerAddress,
@@ -44,6 +43,37 @@ export const orderFactory = {
feeRecipientAddress,
expirationTimeSeconds,
};
+ return order;
+ },
+ async createSignedOrderAsync(
+ provider: Provider,
+ makerAddress: string,
+ takerAddress: string,
+ senderAddress: string,
+ makerFee: BigNumber,
+ takerFee: BigNumber,
+ makerAssetAmount: BigNumber,
+ makerAssetData: string,
+ takerAssetAmount: BigNumber,
+ takerAssetData: string,
+ exchangeAddress: string,
+ feeRecipientAddress: string,
+ expirationTimeSecondsIfExists?: BigNumber,
+ ): Promise<SignedOrder> {
+ const order = orderFactory.createOrder(
+ makerAddress,
+ takerAddress,
+ senderAddress,
+ makerFee,
+ takerFee,
+ makerAssetAmount,
+ makerAssetData,
+ takerAssetAmount,
+ takerAssetData,
+ exchangeAddress,
+ feeRecipientAddress,
+ expirationTimeSecondsIfExists,
+ );
const orderHash = orderHashUtils.getOrderHashHex(order);
const messagePrefixOpts = {
prefixType: MessagePrefixType.EthSign,