aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Evans <jacob@dekz.net>2018-07-09 14:50:26 +0800
committerJacob Evans <jacob@dekz.net>2018-07-11 18:16:59 +0800
commit81b4f4928d1125ebe1900aef597cbe99f5c349bc (patch)
treee237656f362fd669ea23dccd482a54b745576f2c
parentdd77a38535230df7ce92c29dbbdd00938ccc1edb (diff)
downloaddexon-sol-tools-81b4f4928d1125ebe1900aef597cbe99f5c349bc.tar
dexon-sol-tools-81b4f4928d1125ebe1900aef597cbe99f5c349bc.tar.gz
dexon-sol-tools-81b4f4928d1125ebe1900aef597cbe99f5c349bc.tar.bz2
dexon-sol-tools-81b4f4928d1125ebe1900aef597cbe99f5c349bc.tar.lz
dexon-sol-tools-81b4f4928d1125ebe1900aef597cbe99f5c349bc.tar.xz
dexon-sol-tools-81b4f4928d1125ebe1900aef597cbe99f5c349bc.tar.zst
dexon-sol-tools-81b4f4928d1125ebe1900aef597cbe99f5c349bc.zip
Remove extra ERC20ProxyId from Forwarder constructor
-rw-r--r--packages/contracts/src/2.0.0/forwarder/Forwarder.sol1
-rw-r--r--packages/contracts/test/forwarder/forwarder.ts3
-rw-r--r--packages/migrations/artifacts/2.0.0/Forwarder.json14
-rw-r--r--packages/migrations/src/2.0.0/migration.ts2
4 files changed, 9 insertions, 11 deletions
diff --git a/packages/contracts/src/2.0.0/forwarder/Forwarder.sol b/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
index fc17a4c72..546e7f22c 100644
--- a/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
+++ b/packages/contracts/src/2.0.0/forwarder/Forwarder.sol
@@ -40,7 +40,6 @@ contract Forwarder is
address _exchange,
address _etherToken,
address _zrxToken,
- bytes4 _erc20AssetProxyId,
bytes memory _zrxAssetData,
bytes memory _wethAssetData
)
diff --git a/packages/contracts/test/forwarder/forwarder.ts b/packages/contracts/test/forwarder/forwarder.ts
index b4555d417..f0bf6ac03 100644
--- a/packages/contracts/test/forwarder/forwarder.ts
+++ b/packages/contracts/test/forwarder/forwarder.ts
@@ -1,6 +1,6 @@
import { BlockchainLifecycle } from '@0xproject/dev-utils';
import { assetProxyUtils } from '@0xproject/order-utils';
-import { AssetProxyId, RevertReason, SignedOrder } from '@0xproject/types';
+import { RevertReason, SignedOrder } from '@0xproject/types';
import { BigNumber } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as chai from 'chai';
@@ -131,7 +131,6 @@ describe(ContractName.Forwarder, () => {
exchangeInstance.address,
wethContract.address,
zrxToken.address,
- AssetProxyId.ERC20,
zrxAssetData,
wethAssetData,
);
diff --git a/packages/migrations/artifacts/2.0.0/Forwarder.json b/packages/migrations/artifacts/2.0.0/Forwarder.json
index da1f54eca..0bef9adbc 100644
--- a/packages/migrations/artifacts/2.0.0/Forwarder.json
+++ b/packages/migrations/artifacts/2.0.0/Forwarder.json
@@ -709,10 +709,6 @@
"type": "address"
},
{
- "name": "_erc20AssetProxyId",
- "type": "bytes4"
- },
- {
"name": "_zrxAssetData",
"type": "bytes"
},
@@ -896,5 +892,11 @@
}
}
},
- "networks": {}
-} \ No newline at end of file
+ "networks": {
+ "50": {
+ "address": "0xb69e673309512a9d726f87304c6984054f87a93b",
+ "links": {},
+ "constructorArgs": "[\"0x48bacb9266a570d521063ef5dd96e61686dbe788\",\"0x0b1ba0af832d7c05fd64161e0db78e85978e8082\",\"0x871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c\",\"0xf47261b0\",\"0xf47261b0000000000000000000000000871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c\",\"0xf47261b00000000000000000000000000b1ba0af832d7c05fd64161e0db78e85978e8082\"]"
+ }
+ }
+}
diff --git a/packages/migrations/src/2.0.0/migration.ts b/packages/migrations/src/2.0.0/migration.ts
index 248e86102..226bf0a68 100644
--- a/packages/migrations/src/2.0.0/migration.ts
+++ b/packages/migrations/src/2.0.0/migration.ts
@@ -130,7 +130,6 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
);
// Forwarder
- const erc20ProxyId = await erc20proxy.getProxyId.callAsync();
const forwarder = await ForwarderContract.deployFrom0xArtifactAsync(
artifacts.Forwarder,
provider,
@@ -138,7 +137,6 @@ export const runV2MigrationsAsync = async (provider: Provider, artifactsDir: str
exchange.address,
etherToken.address,
zrxToken.address,
- erc20ProxyId,
assetProxyUtils.encodeERC20AssetData(zrxToken.address),
assetProxyUtils.encodeERC20AssetData(etherToken.address),
);