diff options
| author | Alex Browne <stephenalexbrowne@gmail.com> | 2018-10-05 08:35:57 +0800 |
|---|---|---|
| committer | Alex Browne <stephenalexbrowne@gmail.com> | 2018-10-16 04:37:57 +0800 |
| commit | 17c6661e2d3adf115cdc39371ec33bee1e8cd108 (patch) | |
| tree | e670b0011d2f3db05750d2fcb37964857546c4e6 /packages/migrations | |
| parent | 141121004c297ca602ae8d445fe45712268095ae (diff) | |
| download | dexon-sol-tools-17c6661e2d3adf115cdc39371ec33bee1e8cd108.tar dexon-sol-tools-17c6661e2d3adf115cdc39371ec33bee1e8cd108.tar.gz dexon-sol-tools-17c6661e2d3adf115cdc39371ec33bee1e8cd108.tar.bz2 dexon-sol-tools-17c6661e2d3adf115cdc39371ec33bee1e8cd108.tar.lz dexon-sol-tools-17c6661e2d3adf115cdc39371ec33bee1e8cd108.tar.xz dexon-sol-tools-17c6661e2d3adf115cdc39371ec33bee1e8cd108.tar.zst dexon-sol-tools-17c6661e2d3adf115cdc39371ec33bee1e8cd108.zip | |
Cleanup migrations and contracts package. Make contracts private again.
Diffstat (limited to 'packages/migrations')
| -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 |
3 files changed, 10 insertions, 11 deletions
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; |