diff options
Diffstat (limited to 'packages/migrations/src')
-rw-r--r-- | packages/migrations/src/artifacts.ts | 16 | ||||
-rw-r--r-- | packages/migrations/src/migration.ts | 14 | ||||
-rw-r--r-- | packages/migrations/src/types.ts | 1 |
3 files changed, 10 insertions, 21 deletions
diff --git a/packages/migrations/src/artifacts.ts b/packages/migrations/src/artifacts.ts index 42eb1c33e..61b0c3085 100644 --- a/packages/migrations/src/artifacts.ts +++ b/packages/migrations/src/artifacts.ts @@ -1,30 +1,20 @@ import { ContractArtifact } from '@0xproject/sol-compiler'; -import * as AccountLevels from '../artifacts/1.0.0/AccountLevels.json'; -import * as Arbitrage from '../artifacts/1.0.0/Arbitrage.json'; -import * as DummyToken from '../artifacts/1.0.0/DummyToken.json'; -import * as EtherDelta from '../artifacts/1.0.0/EtherDelta.json'; -import * as Exchange from '../artifacts/1.0.0/Exchange.json'; -import * as MaliciousToken from '../artifacts/1.0.0/MaliciousToken.json'; +import * as DummyERC20Token from '../artifacts/1.0.0/DummyERC20Token.json'; +import * as Exchange from '../artifacts/1.0.0/Exchange_v1.json'; import * as MultiSigWalletWithTimeLock from '../artifacts/1.0.0/MultiSigWalletWithTimeLock.json'; import * as MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress from '../artifacts/1.0.0/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json'; -import * as Token from '../artifacts/1.0.0/Token.json'; import * as TokenRegistry from '../artifacts/1.0.0/TokenRegistry.json'; import * as TokenTransferProxy from '../artifacts/1.0.0/TokenTransferProxy.json'; import * as EtherToken from '../artifacts/1.0.0/WETH9.json'; import * as ZRX from '../artifacts/1.0.0/ZRXToken.json'; export const artifacts = { - AccountLevels: (AccountLevels as any) as ContractArtifact, - Arbitrage: (Arbitrage as any) as ContractArtifact, - EtherDelta: (EtherDelta as any) as ContractArtifact, ZRX: (ZRX as any) as ContractArtifact, - DummyToken: (DummyToken as any) as ContractArtifact, - Token: (Token as any) as ContractArtifact, + DummyERC20Token: (DummyERC20Token as any) as ContractArtifact, Exchange: (Exchange as any) as ContractArtifact, EtherToken: (EtherToken as any) as ContractArtifact, TokenRegistry: (TokenRegistry as any) as ContractArtifact, - MaliciousToken: (MaliciousToken as any) as ContractArtifact, TokenTransferProxy: (TokenTransferProxy as any) as ContractArtifact, MultiSigWalletWithTimeLock: (MultiSigWalletWithTimeLock as any) as ContractArtifact, MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress: (MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress as any) as ContractArtifact, diff --git a/packages/migrations/src/migration.ts b/packages/migrations/src/migration.ts index 96973fb62..57ac311d7 100644 --- a/packages/migrations/src/migration.ts +++ b/packages/migrations/src/migration.ts @@ -5,11 +5,11 @@ import * as _ from 'lodash'; import { ArtifactWriter } from './artifact_writer'; import { artifacts } from './artifacts'; -import { DummyTokenContract } from './contract_wrappers/dummy_token'; -import { ExchangeContract } from './contract_wrappers/exchange'; +import { DummyERC20TokenContract } from './contract_wrappers/dummy_e_r_c20_token'; +import { Exchange_v1Contract } from './contract_wrappers/exchange_v1'; import { MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract } from './contract_wrappers/multi_sig_wallet_with_time_lock_except_remove_authorized_address'; import { TokenRegistryContract } from './contract_wrappers/token_registry'; -import { TokenTransferProxyContract } from './contract_wrappers/token_transfer_proxy'; +import { TokenTransferProxy_v1Contract } from './contract_wrappers/tokentransferproxy_v1'; import { WETH9Contract } from './contract_wrappers/weth9'; import { ZRXTokenContract } from './contract_wrappers/zrx_token'; import { ContractName } from './types'; @@ -27,7 +27,7 @@ export const runMigrationsAsync = async (provider: Provider, artifactsDir: strin const web3Wrapper = new Web3Wrapper(provider); const networkId = await web3Wrapper.getNetworkIdAsync(); const artifactsWriter = new ArtifactWriter(artifactsDir, networkId); - const tokenTransferProxy = await TokenTransferProxyContract.deployFrom0xArtifactAsync( + const tokenTransferProxy = await TokenTransferProxy_v1Contract.deployFrom0xArtifactAsync( artifacts.TokenTransferProxy, provider, txDefaults, @@ -49,7 +49,7 @@ export const runMigrationsAsync = async (provider: Provider, artifactsDir: strin const owners = [accounts[0], accounts[1]]; const confirmationsRequired = new BigNumber(2); const secondsRequired = new BigNumber(0); - const exchange = await ExchangeContract.deployFrom0xArtifactAsync( + const exchange = await Exchange_v1Contract.deployFrom0xArtifactAsync( artifacts.Exchange, provider, txDefaults, @@ -106,8 +106,8 @@ export const runMigrationsAsync = async (provider: Provider, artifactsDir: strin ); for (const token of tokenInfo) { const totalSupply = new BigNumber(100000000000000000000); - const dummyToken = await DummyTokenContract.deployFrom0xArtifactAsync( - artifacts.DummyToken, + const dummyToken = await DummyERC20TokenContract.deployFrom0xArtifactAsync( + artifacts.DummyERC20Token, provider, txDefaults, token.name, diff --git a/packages/migrations/src/types.ts b/packages/migrations/src/types.ts index 21daf47f0..5ece26c5d 100644 --- a/packages/migrations/src/types.ts +++ b/packages/migrations/src/types.ts @@ -33,7 +33,6 @@ export enum ContractName { DummyToken = 'DummyToken', WETH9 = 'WETH9', MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress = 'MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress', - MaliciousToken = 'MaliciousToken', AccountLevels = 'AccountLevels', EtherDelta = 'EtherDelta', Arbitrage = 'Arbitrage', |