Prettier fixes

This commit is contained in:
Fabio Berger 2018-07-25 21:36:56 +02:00
parent a0db69ee05
commit 7fc0fd9fb6
6 changed files with 3263 additions and 3199 deletions

View File

@ -61,8 +61,9 @@ yarn migrate:v2-beta-testnet
**Note:** Ledger settings `contract data` must be `on`, and `browser support` must be set to `off`. **Note:** Ledger settings `contract data` must be `on`, and `browser support` must be set to `off`.
Post-publish steps: Post-publish steps:
1. Since we don't re-deploy the `WETH9` nor `ZRXToken` contracts, manually copy over the artifacts for them from `2.0.0` into `2.0.0-beta-testnet` and add the Kovan & ganache addresses to both of their `networks` sections.
2. We now need to copy over the network `50` settings from the `2.0.0` artifacts to the `2.0.0-beta-testnet` artifacts for the newly deployed contracts (e.g `Exchange`, `ERC20Proxy`, `ERC721Proxy` and `AssetProxyOwner`) 1. Since we don't re-deploy the `WETH9` nor `ZRXToken` contracts, manually copy over the artifacts for them from `2.0.0` into `2.0.0-beta-testnet` and add the Kovan & ganache addresses to both of their `networks` sections.
2. We now need to copy over the network `50` settings from the `2.0.0` artifacts to the `2.0.0-beta-testnet` artifacts for the newly deployed contracts (e.g `Exchange`, `ERC20Proxy`, `ERC721Proxy` and `AssetProxyOwner`)
#### V2 (under development) smart contracts #### V2 (under development) smart contracts

View File

@ -43,21 +43,22 @@ export const runV2TestnetMigrationsAsync = async (
// Deploy Exchange // Deploy Exchange
const zrxAddressOnKovan = '0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570'; const zrxAddressOnKovan = '0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570';
const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxAddressOnKovan); const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxAddressOnKovan);
const exchange = await ExchangeContract.deployFrom0xArtifactAsync(artifacts.Exchange, provider, txDefaults, zrxAssetData); const exchange = await ExchangeContract.deployFrom0xArtifactAsync(
artifacts.Exchange,
provider,
txDefaults,
zrxAssetData,
);
artifactsWriter.saveArtifact(exchange); artifactsWriter.saveArtifact(exchange);
let txHash; let txHash;
// Register AssetProxies in Exchange // Register AssetProxies in Exchange
txHash = await exchange.registerAssetProxy.sendTransactionAsync( txHash = await exchange.registerAssetProxy.sendTransactionAsync(erc20proxy.address);
erc20proxy.address,
);
logUtils.log(`transactionHash: ${txHash}`); logUtils.log(`transactionHash: ${txHash}`);
logUtils.log('Registering ERC20Proxy'); logUtils.log('Registering ERC20Proxy');
await web3Wrapper.awaitTransactionSuccessAsync(txHash); await web3Wrapper.awaitTransactionSuccessAsync(txHash);
txHash = await exchange.registerAssetProxy.sendTransactionAsync( txHash = await exchange.registerAssetProxy.sendTransactionAsync(erc721proxy.address);
erc721proxy.address,
);
logUtils.log(`transactionHash: ${txHash}`); logUtils.log(`transactionHash: ${txHash}`);
logUtils.log('Registering ERC721Proxy'); logUtils.log('Registering ERC721Proxy');
await web3Wrapper.awaitTransactionSuccessAsync(txHash); await web3Wrapper.awaitTransactionSuccessAsync(txHash);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long