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

Add Migrations for Forwarder

Browse Source
This commit is contained in:
Jacob Evans 2018-07-09 14:06:06 +10:00
parent b9627e14d0
commit dd77a38535
No known key found for this signature in database
GPG Key ID: 2036DA2ADDFB0842
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/contracts/src/1.0.0/MultiSigWalletWithTImeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol vendored
View File

@ -18,7 +18,7 @@
pragma solidity ^0.4.10;
import "../../current/multisig/MultiSigWalletWithTimeLock.sol";
import "../../2.0.0/multisig/MultiSigWalletWithTimeLock.sol";
contract MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress is MultiSigWalletWithTimeLock {
@ -79,4 +79,4 @@ contract MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress is MultiSigWall
}
return true;
}
}
}

2
packages/migrations/compiler.json
View File

@ -1,5 +1,5 @@
{
"contractsDir": "../contracts/src/contracts",
"contractsDir": "../contracts/src/",
"compilerSettings": {
"optimizer": {
"enabled": true,

16
packages/migrations/src/2.0.0/migration.ts vendored
View File

@ -13,6 +13,7 @@ import { DummyERC721TokenContract } from './contract_wrappers/dummy_erc721_token
import { ERC20ProxyContract } from './contract_wrappers/erc20_proxy';
import { ERC721ProxyContract } from './contract_wrappers/erc721_proxy';
import { ExchangeContract } from './contract_wrappers/exchange';
import { ForwarderContract } from './contract_wrappers/forwarder';
import { WETH9Contract } from './contract_wrappers/weth9';
import { ZRXTokenContract } from './contract_wrappers/zrx_token';
@ -127,4 +128,19 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
erc721TokenInfo[0].name,
erc721TokenInfo[0].symbol,
);
// Forwarder
const erc20ProxyId = await erc20proxy.getProxyId.callAsync();
const forwarder = await ForwarderContract.deployFrom0xArtifactAsync(
artifacts.Forwarder,
provider,
txDefaults,
exchange.address,
etherToken.address,
zrxToken.address,
erc20ProxyId,
assetProxyUtils.encodeERC20AssetData(zrxToken.address),
assetProxyUtils.encodeERC20AssetData(etherToken.address),
);
artifactsWriter.saveArtifact(forwarder);
};