aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-07-18 21:40:45 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-07-18 21:40:45 +0800
commit5044fe4fe4486f67408572cf6807482aecf7f6c9 (patch)
tree59f455c6815059fd4fb011506624c10327b7db61 /packages/0x.js
parent8e49169e6b3233cdc39d1867104cd0ec043c600a (diff)
parente2fb49a8f871fd4b631bb01bb641c632b7c19435 (diff)
downloaddexon-sol-tools-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar
dexon-sol-tools-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.gz
dexon-sol-tools-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.bz2
dexon-sol-tools-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.lz
dexon-sol-tools-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.xz
dexon-sol-tools-5044fe4fe4486f67408572cf6807482aecf7f6c9.tar.zst
dexon-sol-tools-5044fe4fe4486f67408572cf6807482aecf7f6c9.zip
Merge branch 'v2-prototype' into feature/order-watcher-v2
Diffstat (limited to 'packages/0x.js')
-rw-r--r--packages/0x.js/CHANGELOG.json4
-rw-r--r--packages/0x.js/src/0x.ts5
-rw-r--r--packages/0x.js/src/index.ts4
3 files changed, 13 insertions, 0 deletions
diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 9419311dd..4bbefbda4 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -36,6 +36,10 @@
{
"note": "Remove stateLayer config from OrderWatcher. It now always operates on the latest block",
"pr": 875
+ },
+ {
+ "note": "Export ZeroEx.assetData with methods to decode/encode assetData fields found in 0x orders",
+ "pr": 884
}
]
},
diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index 1d33eb7ca..385ba76b5 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -10,6 +10,7 @@ import {
ExchangeWrapper,
} from '@0xproject/contract-wrappers';
import {
+ assetDataUtils,
ecSignOrderHashAsync,
generatePseudoRandomSalt,
isValidSignatureAsync,
@@ -35,6 +36,10 @@ export class ZeroEx {
*/
public static NULL_ADDRESS = constants.NULL_ADDRESS;
/**
+ * A set of methods to easily decode/encode assetData fields found in 0x orders.
+ */
+ public static assetData = assetDataUtils;
+ /**
* An instance of the ExchangeWrapper class containing methods for interacting with the 0x Exchange smart contract.
*/
public exchange: ExchangeWrapper;
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index 95faa860d..95ca07eea 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -12,6 +12,9 @@ export {
OrderStateInvalid,
OrderState,
Token,
+ ERC20AssetData,
+ ERC721AssetData,
+ AssetProxyId,
} from '@0xproject/types';
export {
@@ -59,4 +62,5 @@ export {
ExchangeCancelEventArgs,
ExchangeEventArgs,
ContractWrappersConfig,
+ OrderInfo,
} from '@0xproject/contract-wrappers';