aboutsummaryrefslogtreecommitdiffstats
path: root/packages/migrations/src
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-06-28 07:47:31 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-06-30 08:25:56 +0800
commitd3293a5571b64a2d807f9e71ff87497287e951e0 (patch)
tree634f86c16b812338f56d666df95a29d363eeb87d /packages/migrations/src
parent854752acdf8538879c67c8bf5646c3660a49c2e0 (diff)
downloaddexon-0x-contracts-d3293a5571b64a2d807f9e71ff87497287e951e0.tar.gz
dexon-0x-contracts-d3293a5571b64a2d807f9e71ff87497287e951e0.tar.zst
dexon-0x-contracts-d3293a5571b64a2d807f9e71ff87497287e951e0.zip
Fix migrations
Diffstat (limited to 'packages/migrations/src')
-rw-r--r--packages/migrations/src/migrate.ts2
-rw-r--r--packages/migrations/src/utils/constants.ts1
-rw-r--r--packages/migrations/src/utils/provider_factory.ts15
3 files changed, 9 insertions, 9 deletions
diff --git a/packages/migrations/src/migrate.ts b/packages/migrations/src/migrate.ts
index d9cc1ae01..4661e1ead 100644
--- a/packages/migrations/src/migrate.ts
+++ b/packages/migrations/src/migrate.ts
@@ -9,6 +9,7 @@ import { runV1MigrationsAsync } from './1.0.0/migration';
import { runV2TestnetMigrationsAsync } from './2.0.0-beta-testnet/migration';
import { runV2MigrationsAsync } from './2.0.0/migration';
+import { constants } from './utils/constants';
import { providerFactory } from './utils/provider_factory';
enum ContractVersions {
@@ -39,6 +40,7 @@ const args = yargs.argv;
const accounts = await web3Wrapper.getAvailableAddressesAsync();
const testnetTxDefaults = {
from: accounts[0],
+ gas: devConstants.GAS_LIMIT,
};
await runV2TestnetMigrationsAsync(ledgerProvider, artifactsDir, testnetTxDefaults);
break;
diff --git a/packages/migrations/src/utils/constants.ts b/packages/migrations/src/utils/constants.ts
index 21887ab16..068122e28 100644
--- a/packages/migrations/src/utils/constants.ts
+++ b/packages/migrations/src/utils/constants.ts
@@ -12,4 +12,5 @@ export const constants = {
ERC721_PROXY_ID: '0x08e937fa',
NULL_ADDRESS: '0x0000000000000000000000000000000000000000',
RPC_URL: 'http://localhost:8545',
+ KOVAN_NETWORK_ID: 42,
};
diff --git a/packages/migrations/src/utils/provider_factory.ts b/packages/migrations/src/utils/provider_factory.ts
index 14b1be982..6ae2ad41c 100644
--- a/packages/migrations/src/utils/provider_factory.ts
+++ b/packages/migrations/src/utils/provider_factory.ts
@@ -1,5 +1,4 @@
import { LedgerSubprovider } from '@0xproject/subproviders';
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
import Eth from '@ledgerhq/hw-app-eth';
import TransportNodeHid from '@ledgerhq/hw-transport-node-hid';
import { Provider } from 'ethereum-types';
@@ -18,19 +17,17 @@ async function ledgerEthereumNodeJsClientFactoryAsync(): Promise<LedgerEthereumC
export const providerFactory = {
async getLedgerProviderAsync(): Promise<Provider> {
const provider = new ProviderEngine();
- provider.addProvider(
- new RpcSubprovider({
- rpcUrl: constants.RPC_URL,
- }),
- );
- const web3Wrapper = new Web3Wrapper(provider);
- const networkId = await web3Wrapper.getNetworkIdAsync();
const ledgerWalletConfigs = {
- networkId,
+ networkId: constants.KOVAN_NETWORK_ID,
ledgerEthereumClientFactoryAsync: ledgerEthereumNodeJsClientFactoryAsync,
};
const ledgerSubprovider = new LedgerSubprovider(ledgerWalletConfigs);
provider.addProvider(ledgerSubprovider);
+ provider.addProvider(
+ new RpcSubprovider({
+ rpcUrl: constants.RPC_URL,
+ }),
+ );
provider.start();
return provider;
},