aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js
diff options
context:
space:
mode:
Diffstat (limited to 'packages/0x.js')
-rw-r--r--packages/0x.js/CHANGELOG.json21
-rw-r--r--packages/0x.js/CHANGELOG.md16
-rw-r--r--packages/0x.js/package.json30
-rw-r--r--packages/0x.js/src/order_watcher/event_watcher.ts2
-rw-r--r--packages/0x.js/src/types.ts24
5 files changed, 62 insertions, 31 deletions
diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 2dfcc448e..04d115809 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,5 +1,23 @@
[
{
+ "version": "0.36.3",
+ "changes": [
+ {
+ "note": "Move @0xproject/migrations to devDependencies"
+ }
+ ],
+ "timestamp": 1524079658
+ },
+ {
+ "timestamp": 1524073495,
+ "version": "0.36.2",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "0.36.1",
"changes": [
{
@@ -9,7 +27,8 @@
"note": "Fix redundant expired order removal bug",
"pr": 527
}
- ]
+ ],
+ "timestamp": 1524044013
},
{
"version": "0.36.0",
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index 693b4f4b2..f800b86db 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -5,13 +5,27 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v0.36.3 - _April 18, 2018_
+
+ * Move @0xproject/migrations to devDependencies
+
+## v0.36.2 - _April 18, 2018_
+
+ * Dependencies updated
+
+## v0.36.1 - _April 18, 2018_
+
+ * Internal changes and refactoring
+ * Fix redundant expired order removal bug (#527)
+
## v0.36.0 - _April 11, 2018_
* Moved Web3.Provider to `@0xproject/types:Provider` (#501)
+ * Add `zeroEx.exchange.getOrderStateAsync` to allow obtaining current OrderState for a signedOrder (#510)
## v0.35.0 - _April 2, 2018_
- * Removed `ZeroExError.TransactionMiningTimeout` and moved it to '@0xproject/web3_wrapper' `Web3WrapperErrors.TransactionMiningTimeout` (#485)
+ * Removed `ZeroExError.TransactionMiningTimeout` and moved it to '@0xproject/web3-wrapper' `Web3WrapperErrors.TransactionMiningTimeout` (#485)
## v0.34.0 - _April 2, 2018_
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 37a321dbd..4b2d92240 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
{
"name": "0x.js",
- "version": "0.36.0",
+ "version": "0.36.3",
"description": "A javascript library for interacting with the 0x protocol",
"keywords": [
"0x.js",
@@ -61,11 +61,12 @@
"node": ">=6.0.0"
},
"devDependencies": {
- "@0xproject/deployer": "^0.4.0",
- "@0xproject/dev-utils": "^0.3.5",
- "@0xproject/monorepo-scripts": "^0.1.17",
- "@0xproject/subproviders": "^0.8.4",
- "@0xproject/tslint-config": "^0.4.15",
+ "@0xproject/deployer": "^0.4.1",
+ "@0xproject/dev-utils": "^0.3.6",
+ "@0xproject/migrations": "^0.0.3",
+ "@0xproject/monorepo-scripts": "^0.1.18",
+ "@0xproject/subproviders": "^0.9.0",
+ "@0xproject/tslint-config": "^0.4.16",
"@types/bintrees": "^1.0.2",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
@@ -96,13 +97,13 @@
"webpack": "^3.1.0"
},
"dependencies": {
- "@0xproject/assert": "^0.2.6",
- "@0xproject/base-contract": "^0.2.0",
- "@0xproject/json-schemas": "^0.7.20",
- "@0xproject/types": "^0.6.0",
- "@0xproject/typescript-typings": "^0.1.0",
- "@0xproject/utils": "^0.5.1",
- "@0xproject/web3-wrapper": "^0.6.0",
+ "@0xproject/assert": "^0.2.7",
+ "@0xproject/base-contract": "^0.2.1",
+ "@0xproject/json-schemas": "^0.7.21",
+ "@0xproject/types": "^0.6.1",
+ "@0xproject/typescript-typings": "^0.2.0",
+ "@0xproject/utils": "^0.5.2",
+ "@0xproject/web3-wrapper": "^0.6.1",
"bintrees": "^1.0.2",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",
@@ -114,9 +115,6 @@
"uuid": "^3.1.0",
"web3": "^0.20.0"
},
- "optionalDependencies": {
- "@0xproject/migrations": "^0.0.1"
- },
"publishConfig": {
"access": "public"
}
diff --git a/packages/0x.js/src/order_watcher/event_watcher.ts b/packages/0x.js/src/order_watcher/event_watcher.ts
index 47bbd5b2e..de5a99a46 100644
--- a/packages/0x.js/src/order_watcher/event_watcher.ts
+++ b/packages/0x.js/src/order_watcher/event_watcher.ts
@@ -13,7 +13,7 @@ enum LogEventState {
Added,
}
-/*
+/**
* The EventWatcher watches for blockchain events at the specified block confirmation
* depth.
*/
diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts
index d1c643a57..151204928 100644
--- a/packages/0x.js/src/types.ts
+++ b/packages/0x.js/src/types.ts
@@ -154,13 +154,13 @@ export interface OrderFillRequest {
export type AsyncMethod = (...args: any[]) => Promise<any>;
export type SyncMethod = (...args: any[]) => any;
-/*
- * orderExpirationCheckingIntervalMs: How often to check for expired orders. Default: 50
- * eventPollingIntervalMs: How often to poll the Ethereum node for new events. Default: 200
+/**
+ * orderExpirationCheckingIntervalMs: How often to check for expired orders. Default=50.
+ * eventPollingIntervalMs: How often to poll the Ethereum node for new events. Default=200.
* expirationMarginMs: Amount of time before order expiry that you'd like to be notified
- * of an orders expiration. Default: 0
- * cleanupJobIntervalMs: How often to run a cleanup job which revalidates all the orders. Defaults: 1h
- * stateLayer: Optional blockchain state layer OrderWatcher will monitor for new events. Default: latest
+ * of an orders expiration. Default=0.
+ * cleanupJobIntervalMs: How often to run a cleanup job which revalidates all the orders. Default=1hr.
+ * stateLayer: Optional blockchain state layer OrderWatcher will monitor for new events. Default=latest.
*/
export interface OrderStateWatcherConfig {
orderExpirationCheckingIntervalMs?: number;
@@ -170,7 +170,7 @@ export interface OrderStateWatcherConfig {
stateLayer: BlockParamLiteral;
}
-/*
+/**
* networkId: The id of the underlying ethereum network your provider is connected to. (1-mainnet, 3-ropsten, 4-rinkeby, 42-kovan, 50-testrpc)
* gasPrice: Gas price to use with every transaction
* exchangeContractAddress: The address of an exchange contract to use
@@ -201,7 +201,7 @@ export interface Artifact {
};
}
-/*
+/**
* expectedFillTakerTokenAmount: If specified, the validation method will ensure that the
* supplied order maker has a sufficient allowance/balance to fill this amount of the order's
* takerTokenAmount. If not specified, the validation method ensures that the maker has a sufficient
@@ -211,7 +211,7 @@ export interface ValidateOrderFillableOpts {
expectedFillTakerTokenAmount?: BigNumber;
}
-/*
+/**
* defaultBlock: The block up to which to query the blockchain state. Setting this to a historical block number
* let's the user query the blockchain's state at an arbitrary point in time. In order for this to work, the
* backing Ethereum node must keep the entire historical state of the chain (e.g setting `--pruning=archive`
@@ -221,7 +221,7 @@ export interface MethodOpts {
defaultBlock?: BlockParam;
}
-/*
+/**
* gasPrice: Gas price in Wei to use for a transaction
* gasLimit: The amount of gas to send with a transaction
*/
@@ -230,9 +230,9 @@ export interface TransactionOpts {
gasLimit?: number;
}
-/*
+/**
* shouldValidate: Flag indicating whether the library should make attempts to validate a transaction before
- * broadcasting it. For example, order has a valid signature, maker has sufficient funds, etc. Default: true
+ * broadcasting it. For example, order has a valid signature, maker has sufficient funds, etc. Default=true.
*/
export interface OrderTransactionOpts extends TransactionOpts {
shouldValidate?: boolean;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-31 12:49:17 +0800