diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/contracts/package.json | 5 | ||||
| -rw-r--r-- | packages/contracts/src/index.ts | 3 | ||||
| -rw-r--r-- | packages/migrations/package.json | 3 | ||||
| -rw-r--r-- | packages/migrations/src/globals.d.ts | 6 | ||||
| -rw-r--r-- | packages/migrations/src/migration.ts | 12 |
5 files changed, 13 insertions, 16 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json index fcb9f70f0..284c42977 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,6 +1,7 @@ { - "name": "@0xproject/contracts", - "version": "2.1.48", + "private": true, + "name": "contracts", + "version": "2.1.49", "engines": { "node": ">=6.12" }, diff --git a/packages/contracts/src/index.ts b/packages/contracts/src/index.ts deleted file mode 100644 index 72f75c594..000000000 --- a/packages/contracts/src/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './artifacts'; -import * as wrappers from './wrappers'; -export { wrappers }; diff --git a/packages/migrations/package.json b/packages/migrations/package.json index df68a1eb7..1fc1b2114 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -31,8 +31,9 @@ "yargs": "^10.0.3" }, "dependencies": { - "@0xproject/contracts": "^2.1.48", + "@0xproject/abi-gen-wrappers": "^1.0.0", "@0xproject/base-contract": "^3.0.1", + "@0xproject/contract-artifacts": "^1.0.0", "@0xproject/order-utils": "^1.0.7", "@0xproject/sol-compiler": "^1.1.7", "@0xproject/subproviders": "^2.0.7", diff --git a/packages/migrations/src/globals.d.ts b/packages/migrations/src/globals.d.ts deleted file mode 100644 index 94e63a32d..000000000 --- a/packages/migrations/src/globals.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -declare module '*.json' { - const json: any; - /* tslint:disable */ - export default json; - /* tslint:enable */ -} diff --git a/packages/migrations/src/migration.ts b/packages/migrations/src/migration.ts index a22c34a23..7c76a7b7b 100644 --- a/packages/migrations/src/migration.ts +++ b/packages/migrations/src/migration.ts @@ -1,4 +1,5 @@ -import { artifacts, wrappers } from '@0xproject/contracts'; +import * as wrappers from '@0xproject/abi-gen-wrappers'; +import * as artifacts from '@0xproject/contract-artifacts'; import { assetDataUtils } from '@0xproject/order-utils'; import { ContractAddresses } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; @@ -29,7 +30,7 @@ let _cachedContractAddresses: ContractAddresses | undefined; * @param provider Web3 provider instance. * @param txDefaults Default transaction values to use when deploying contracts. */ -export async function runMigrationsAsync(provider: Provider, txDefaults: Partial<TxData>): Promise<MigrationsResult> { +export async function runMigrationsAsync(provider: Provider, txDefaults: Partial<TxData>): Promise<void> { const web3Wrapper = new Web3Wrapper(provider); // Proxies @@ -60,7 +61,6 @@ export async function runMigrationsAsync(provider: Provider, txDefaults: Partial artifacts.Exchange, provider, txDefaults, - zrxAssetData, ); // Multisigs @@ -165,9 +165,13 @@ export async function runMigrationsAsync(provider: Provider, txDefaults: Partial orderValidator, }; _cachedMigrationsResult = migrationsResult; - return migrationsResult; } +/** + * Returns the addresses of all contracts that were deployed during migrations. + * Throws if migrations have not been run yet. + * @returns Addresses of all contracts that were deployed. + */ export function getContractAddresses(): ContractAddresses { if (!_.isUndefined(_cachedContractAddresses)) { return _cachedContractAddresses; |