aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-08-10 06:57:12 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-08-10 06:57:12 +0800
commit938a99f435ca01853ecb31f9267e2ba4b501d206 (patch)
tree6b1aea79d1130206f6f69b68e0747c87616f2fb6 /packages/0x.js
parentb2c666bb1f2830211db208ba8398f2de799c8ee6 (diff)
parentf97ec000e109341f7b200d0ff9ff324bf3f97d3e (diff)
downloaddexon-sol-tools-938a99f435ca01853ecb31f9267e2ba4b501d206.tar
dexon-sol-tools-938a99f435ca01853ecb31f9267e2ba4b501d206.tar.gz
dexon-sol-tools-938a99f435ca01853ecb31f9267e2ba4b501d206.tar.bz2
dexon-sol-tools-938a99f435ca01853ecb31f9267e2ba4b501d206.tar.lz
dexon-sol-tools-938a99f435ca01853ecb31f9267e2ba4b501d206.tar.xz
dexon-sol-tools-938a99f435ca01853ecb31f9267e2ba4b501d206.tar.zst
dexon-sol-tools-938a99f435ca01853ecb31f9267e2ba4b501d206.zip
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/sra/add-sra-package
Diffstat (limited to 'packages/0x.js')
-rw-r--r--packages/0x.js/CHANGELOG.json8
-rw-r--r--packages/0x.js/package.json4
-rw-r--r--packages/0x.js/test/0x.js_test.ts7
3 files changed, 14 insertions, 5 deletions
diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 4f39a9b8c..913b7a76e 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,5 +1,13 @@
[
{
+ "version": "1.0.1-rc.3",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "1.0.1-rc.2",
"changes": [
{
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 7d3fa92c3..b023ce525 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -85,7 +85,7 @@
"dirty-chai": "^2.0.1",
"json-loader": "^0.5.4",
"make-promises-safe": "^1.1.0",
- "mocha": "^4.0.1",
+ "mocha": "^4.1.0",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"opn-cli": "^3.1.0",
@@ -110,7 +110,7 @@
"@0xproject/web3-wrapper": "^1.1.2",
"ethereum-types": "^1.0.3",
"ethers": "3.0.22",
- "lodash": "^4.17.4"
+ "lodash": "^4.17.5"
},
"publishConfig": {
"access": "public"
diff --git a/packages/0x.js/test/0x.js_test.ts b/packages/0x.js/test/0x.js_test.ts
index b4baecb1e..be2a94482 100644
--- a/packages/0x.js/test/0x.js_test.ts
+++ b/packages/0x.js/test/0x.js_test.ts
@@ -48,10 +48,11 @@ describe('ZeroEx library', () => {
const ethSignSignature =
'0x1B61a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc3340349190569279751135161d22529dc25add4f6069af05be04cacbda2ace225403';
const address = '0x5409ed021d9299bf6814279a6a1411a7e866a631';
+ const bytes32Zeros = '0x0000000000000000000000000000000000000000000000000000000000000000';
it("should return false if the data doesn't pertain to the signature & address", async () => {
- return expect((zeroEx.exchange as any).isValidSignatureAsync('0x0', address, ethSignSignature)).to.become(
- false,
- );
+ return expect(
+ (zeroEx.exchange as any).isValidSignatureAsync(bytes32Zeros, address, ethSignSignature),
+ ).to.become(false);
});
it("should return false if the address doesn't pertain to the signature & data", async () => {
const validUnrelatedAddress = '0x8b0292b11a196601ed2ce54b665cafeca0347d42';