aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contract-wrappers
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-05-25 07:31:21 +0800
committerFabio Berger <me@fabioberger.com>2018-05-25 07:31:21 +0800
commit4e5bfae332279acbb58d76a32102b5a27dde069d (patch)
treee613c1a5ebba642a171f0817ef8c336088091543 /packages/contract-wrappers
parent662dc1287737aa02c0c822d7c53be114230422c0 (diff)
parent895a9093aa5f204f9f7ad0fedb2934a8b6c40b17 (diff)
downloaddexon-sol-tools-4e5bfae332279acbb58d76a32102b5a27dde069d.tar
dexon-sol-tools-4e5bfae332279acbb58d76a32102b5a27dde069d.tar.gz
dexon-sol-tools-4e5bfae332279acbb58d76a32102b5a27dde069d.tar.bz2
dexon-sol-tools-4e5bfae332279acbb58d76a32102b5a27dde069d.tar.lz
dexon-sol-tools-4e5bfae332279acbb58d76a32102b5a27dde069d.tar.xz
dexon-sol-tools-4e5bfae332279acbb58d76a32102b5a27dde069d.tar.zst
dexon-sol-tools-4e5bfae332279acbb58d76a32102b5a27dde069d.zip
Merge branch 'v2-prototype' into refactor/order-utils/for-v2
* v2-prototype: Temporarily disable installation tests Use domain separator for exchange address publicGetOrderSchemaHash -> getOrderSchemaHash Update order hash to match latest eip712 Pin connect in sra-report Fix a typo Pin types in sra-report Fix linter issues Unpin types version in @0xproject/connect Pin types version in website Do a fake version bump on types so that yarn doesn't try to install updated version for not yet migrated packages Migrate migrations to v2
Diffstat (limited to 'packages/contract-wrappers')
-rw-r--r--packages/contract-wrappers/package.json2
-rw-r--r--packages/contract-wrappers/test/global_hooks.ts4
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index 6183bb701..9185ab46f 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -81,7 +81,7 @@
"@0xproject/fill-scenarios": "^0.0.2",
"@0xproject/json-schemas": "0.7.22",
"@0xproject/order-utils": "^0.0.5",
- "@0xproject/types": "^0.7.0",
+ "@0xproject/types": "0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
diff --git a/packages/contract-wrappers/test/global_hooks.ts b/packages/contract-wrappers/test/global_hooks.ts
index fa1dfae38..d9768e61c 100644
--- a/packages/contract-wrappers/test/global_hooks.ts
+++ b/packages/contract-wrappers/test/global_hooks.ts
@@ -1,5 +1,5 @@
import { devConstants } from '@0xproject/dev-utils';
-import { runMigrationsAsync } from '@0xproject/migrations';
+import { runV1MigrationsAsync } from '@0xproject/migrations';
import * as path from 'path';
import { constants } from './utils/constants';
@@ -15,5 +15,5 @@ before('migrate contracts', async function(): Promise<void> {
from: devConstants.TESTRPC_FIRST_ADDRESS,
};
const artifactsDir = `../migrations/artifacts/1.0.0`;
- await runMigrationsAsync(provider, artifactsDir, txDefaults);
+ await runV1MigrationsAsync(provider, artifactsDir, txDefaults);
});