crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove owner from migrations

Browse Source
This commit is contained in:
Jacob Evans
2019-01-21 15:16:16 +11:00
parent b5fd3c72a0
commit ebbb4df227
1 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
packages/migrations/src/migration.ts
View File

@@ -18,8 +18,9 @@ import { erc20TokenInfo, erc721TokenInfo } from './utils/token_info';
*/ */
export async function runMigrationsAsync(provider: Provider, txDefaults: Partial<TxData>): Promise<ContractAddresses> { export async function runMigrationsAsync(provider: Provider, txDefaults: Partial<TxData>): Promise<ContractAddresses> {
const web3Wrapper = new Web3Wrapper(provider); const web3Wrapper = new Web3Wrapper(provider);
const accounts: string[] = await web3Wrapper.getAvailableAddressesAsync(); if (_.isUndefined(txDefaults.from)) {
const owner = accounts[0]; throw new Error('from address must be specified');
}
// Proxies // Proxies
const erc20Proxy = await wrappers.ERC20ProxyContract.deployFrom0xArtifactAsync( const erc20Proxy = await wrappers.ERC20ProxyContract.deployFrom0xArtifactAsync(
@@ -84,48 +85,38 @@ export async function runMigrationsAsync(provider: Provider, txDefaults: Partial
); );
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, txDefaults),
from: owner,
}),
); );
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, txDefaults),
from: owner,
}),
); );
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await multiAssetProxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, { await multiAssetProxy.addAuthorizedAddress.sendTransactionAsync(exchange.address, txDefaults),
from: owner,
}),
); );
// MultiAssetProxy // MultiAssetProxy
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(multiAssetProxy.address, { await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(multiAssetProxy.address, txDefaults),
from: owner,
}),
); );
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(multiAssetProxy.address, { await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(multiAssetProxy.address, txDefaults),
from: owner,
}),
); );
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await multiAssetProxy.registerAssetProxy.sendTransactionAsync(erc20Proxy.address), await multiAssetProxy.registerAssetProxy.sendTransactionAsync(erc20Proxy.address, txDefaults),
); );
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await multiAssetProxy.registerAssetProxy.sendTransactionAsync(erc721Proxy.address), await multiAssetProxy.registerAssetProxy.sendTransactionAsync(erc721Proxy.address, txDefaults),
); );
// Register the Asset Proxies to the Exchange // Register the Asset Proxies to the Exchange
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await exchange.registerAssetProxy.sendTransactionAsync(erc20Proxy.address), await exchange.registerAssetProxy.sendTransactionAsync(erc20Proxy.address, txDefaults),
); );
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await exchange.registerAssetProxy.sendTransactionAsync(erc721Proxy.address), await exchange.registerAssetProxy.sendTransactionAsync(erc721Proxy.address, txDefaults),
); );
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await exchange.registerAssetProxy.sendTransactionAsync(multiAssetProxy.address), await exchange.registerAssetProxy.sendTransactionAsync(multiAssetProxy.address, txDefaults),
); );
// Forwarder // Forwarder
@@ -156,7 +147,8 @@ export async function runMigrationsAsync(provider: Provider, txDefaults: Partial
); );
// Multisigs // Multisigs
const owners = [accounts[0], accounts[1]]; const accounts: string[] = await web3Wrapper.getAvailableAddressesAsync();
const owners = _.uniq([accounts[0], accounts[1], txDefaults.from]);
const confirmationsRequired = new BigNumber(2); const confirmationsRequired = new BigNumber(2);
const secondsRequired = new BigNumber(0); const secondsRequired = new BigNumber(0);
@@ -173,19 +165,13 @@ export async function runMigrationsAsync(provider: Provider, txDefaults: Partial
// Transfer Ownership to the Asset Proxy Owner // Transfer Ownership to the Asset Proxy Owner
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await erc20Proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, { await erc20Proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, txDefaults),
from: owner,
}),
); );
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await erc721Proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, { await erc721Proxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, txDefaults),
from: owner,
}),
); );
await web3Wrapper.awaitTransactionSuccessAsync( await web3Wrapper.awaitTransactionSuccessAsync(
await multiAssetProxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, { await multiAssetProxy.transferOwnership.sendTransactionAsync(assetProxyOwner.address, txDefaults),
from: owner,
}),
); );
// Fund the Forwarder with ZRX // Fund the Forwarder with ZRX