aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/contracts/package.json2
-rw-r--r--packages/contracts/src/2.0.0/forwarder/MixinERC20.sol1
-rw-r--r--packages/contracts/src/2.0.0/forwarder/MixinWethFees.sol1
-rw-r--r--packages/contracts/src/2.0.0/protocol/AssetProxy/ERC20Proxy.sol1
-rw-r--r--packages/contracts/src/2.0.0/protocol/AssetProxy/ERC721Proxy.sol1
-rw-r--r--packages/contracts/src/2.0.0/protocol/AssetProxy/MixinAuthorizable.sol1
-rw-r--r--packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAssetProxy.sol1
-rw-r--r--packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAuthorizable.sol1
-rw-r--r--packages/contracts/src/2.0.0/protocol/AssetProxy/mixins/MAuthorizable.sol1
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol8
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol3
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/MixinSignatureValidator.sol1
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol19
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IMatchOrders.sol1
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IWrapperFunctions.sol1
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol30
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/mixins/MAssetProxyDispatcher.sol1
-rw-r--r--packages/contracts/src/2.0.0/test/DummyERC20Token/DummyERC20Token.sol1
-rw-r--r--packages/contracts/src/2.0.0/test/DummyERC721Token/DummyERC721Token.sol1
-rw-r--r--packages/contracts/src/2.0.0/test/Mintable/Mintable.sol6
-rw-r--r--packages/contracts/src/2.0.0/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol4
-rw-r--r--packages/contracts/src/2.0.0/test/TestLibBytes/TestLibBytes.sol1
-rw-r--r--packages/contracts/src/2.0.0/test/TestLibs/TestLibs.sol6
-rw-r--r--packages/contracts/src/2.0.0/test/TestSignatureValidator/TestSignatureValidator.sol1
-rw-r--r--packages/contracts/src/2.0.0/tokens/ERC20Token/ERC20Token.sol1
-rw-r--r--packages/contracts/src/2.0.0/tokens/ERC20Token/IERC20Token.sol1
-rw-r--r--packages/contracts/src/2.0.0/tokens/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol1
-rw-r--r--packages/contracts/src/2.0.0/utils/Ownable/IOwnable.sol1
-rw-r--r--packages/contracts/src/2.0.0/utils/Ownable/Ownable.sol1
-rw-r--r--packages/contracts/src/2.0.0/utils/SafeMath/SafeMath.sol15
-rw-r--r--packages/website/public/images/token_icons/1ST.png (renamed from packages/website/public/images/token_icons/firstblood.jpg)bin7872 -> 7872 bytes
-rw-r--r--packages/website/public/images/token_icons/ABYSS.pngbin0 -> 13633 bytes
-rw-r--r--packages/website/public/images/token_icons/ADT.pngbin0 -> 10747 bytes
-rw-r--r--packages/website/public/images/token_icons/AE.pngbin0 -> 12322 bytes
-rw-r--r--packages/website/public/images/token_icons/AION.pngbin0 -> 2777 bytes
-rw-r--r--packages/website/public/images/token_icons/AIR.pngbin0 -> 20802 bytes
-rw-r--r--packages/website/public/images/token_icons/ANT.pngbin0 -> 42477 bytes
-rw-r--r--packages/website/public/images/token_icons/APCC.pngbin0 -> 19592 bytes
-rw-r--r--packages/website/public/images/token_icons/APPC.pngbin0 -> 19592 bytes
-rw-r--r--packages/website/public/images/token_icons/ARN.pngbin0 -> 16200 bytes
-rw-r--r--packages/website/public/images/token_icons/ART.pngbin0 -> 12430 bytes
-rw-r--r--packages/website/public/images/token_icons/AST.pngbin0 -> 14169 bytes
-rw-r--r--packages/website/public/images/token_icons/BAT.pngbin0 -> 6188 bytes
-rw-r--r--packages/website/public/images/token_icons/BCAP.pngbin0 -> 7787 bytes
-rw-r--r--packages/website/public/images/token_icons/BCPT.pngbin0 -> 10283 bytes
-rw-r--r--packages/website/public/images/token_icons/BNT.pngbin0 -> 4011 bytes
-rw-r--r--packages/website/public/images/token_icons/BRM.pngbin0 -> 18794 bytes
-rw-r--r--packages/website/public/images/token_icons/CAG.pngbin0 -> 11062 bytes
-rw-r--r--packages/website/public/images/token_icons/CAN.pngbin0 -> 10234 bytes
-rw-r--r--packages/website/public/images/token_icons/CAT.pngbin0 -> 23361 bytes
-rw-r--r--packages/website/public/images/token_icons/CFI.pngbin0 -> 11105 bytes
-rw-r--r--packages/website/public/images/token_icons/CVC.png (renamed from packages/website/public/images/token_icons/civic.png)bin10700 -> 10700 bytes
-rw-r--r--packages/website/public/images/token_icons/DAI.pngbin0 -> 6926 bytes
-rw-r--r--packages/website/public/images/token_icons/DATA.pngbin0 -> 13313 bytes
-rw-r--r--packages/website/public/images/token_icons/DEB.pngbin0 -> 13991 bytes
-rw-r--r--packages/website/public/images/token_icons/DGD.pngbin0 -> 23282 bytes
-rw-r--r--packages/website/public/images/token_icons/DIVX.pngbin0 -> 5110 bytes
-rw-r--r--packages/website/public/images/token_icons/DNT.pngbin0 -> 10054 bytes
-rw-r--r--packages/website/public/images/token_icons/EDG.png (renamed from packages/website/public/images/token_icons/edgeless.png)bin2712 -> 2712 bytes
-rw-r--r--packages/website/public/images/token_icons/EDU.pngbin0 -> 13535 bytes
-rw-r--r--packages/website/public/images/token_icons/ELEC.pngbin0 -> 11379 bytes
-rw-r--r--packages/website/public/images/token_icons/EMONT.pngbin0 -> 10523 bytes
-rw-r--r--packages/website/public/images/token_icons/ENG.pngbin0 -> 6767 bytes
-rw-r--r--packages/website/public/images/token_icons/ENTR.pngbin0 -> 3951 bytes
-rw-r--r--packages/website/public/images/token_icons/EVE.pngbin0 -> 5895 bytes
-rw-r--r--packages/website/public/images/token_icons/FUN.pngbin0 -> 14973 bytes
-rw-r--r--packages/website/public/images/token_icons/GEE.pngbin0 -> 10235 bytes
-rw-r--r--packages/website/public/images/token_icons/GEN.pngbin0 -> 5280 bytes
-rw-r--r--packages/website/public/images/token_icons/GET.pngbin0 -> 11930 bytes
-rw-r--r--packages/website/public/images/token_icons/GNO.pngbin0 -> 16559 bytes
-rw-r--r--packages/website/public/images/token_icons/GNT.png (renamed from packages/website/public/images/token_icons/golem.png)bin2990 -> 2990 bytes
-rw-r--r--packages/website/public/images/token_icons/HGT.pngbin0 -> 5709 bytes
-rw-r--r--packages/website/public/images/token_icons/HOT.pngbin0 -> 4578 bytes
-rw-r--r--packages/website/public/images/token_icons/ICN.pngbin0 -> 3962 bytes
-rw-r--r--packages/website/public/images/token_icons/IND.pngbin0 -> 4583 bytes
-rw-r--r--packages/website/public/images/token_icons/J8T.pngbin0 -> 10835 bytes
-rw-r--r--packages/website/public/images/token_icons/JET.pngbin0 -> 18374 bytes
-rw-r--r--packages/website/public/images/token_icons/KIN.pngbin0 -> 6075 bytes
-rw-r--r--packages/website/public/images/token_icons/KNC.pngbin0 -> 8396 bytes
-rw-r--r--packages/website/public/images/token_icons/LINK.pngbin0 -> 11267 bytes
-rw-r--r--packages/website/public/images/token_icons/LOOM.pngbin0 -> 9491 bytes
-rw-r--r--packages/website/public/images/token_icons/LUN.pngbin0 -> 13648 bytes
-rw-r--r--packages/website/public/images/token_icons/MANA.pngbin0 -> 17411 bytes
-rw-r--r--packages/website/public/images/token_icons/MCO.pngbin0 -> 6487 bytes
-rw-r--r--packages/website/public/images/token_icons/MKR.pngbin0 -> 6967 bytes
-rw-r--r--packages/website/public/images/token_icons/MLN.png (renamed from packages/website/public/images/token_icons/melon.png)bin3408 -> 3408 bytes
-rw-r--r--packages/website/public/images/token_icons/MOD.pngbin0 -> 7088 bytes
-rw-r--r--packages/website/public/images/token_icons/MORPH.pngbin0 -> 8919 bytes
-rw-r--r--packages/website/public/images/token_icons/MOT.pngbin0 -> 6069 bytes
-rw-r--r--packages/website/public/images/token_icons/MTL.pngbin0 -> 3540 bytes
-rw-r--r--packages/website/public/images/token_icons/NANJ.pngbin0 -> 11577 bytes
-rw-r--r--packages/website/public/images/token_icons/NAVI.pngbin0 -> 6827 bytes
-rw-r--r--packages/website/public/images/token_icons/NCT.pngbin0 -> 5462 bytes
-rw-r--r--packages/website/public/images/token_icons/NDC.pngbin0 -> 20972 bytes
-rw-r--r--packages/website/public/images/token_icons/NEXO.pngbin0 -> 4689 bytes
-rw-r--r--packages/website/public/images/token_icons/NMR.pngbin0 -> 21822 bytes
-rw-r--r--packages/website/public/images/token_icons/OAX.pngbin0 -> 6331 bytes
-rw-r--r--packages/website/public/images/token_icons/OCC.pngbin0 -> 7774 bytes
-rw-r--r--packages/website/public/images/token_icons/OMG.pngbin0 -> 5311 bytes
-rw-r--r--packages/website/public/images/token_icons/OMX.pngbin0 -> 7320 bytes
-rw-r--r--packages/website/public/images/token_icons/PAL.pngbin0 -> 13196 bytes
-rw-r--r--packages/website/public/images/token_icons/PAY.png (renamed from packages/website/public/images/token_icons/tenx.png)bin7276 -> 7276 bytes
-rw-r--r--packages/website/public/images/token_icons/PKT.pngbin0 -> 5900 bytes
-rw-r--r--packages/website/public/images/token_icons/PLAY.pngbin0 -> 3226 bytes
-rw-r--r--packages/website/public/images/token_icons/PLU.pngbin0 -> 51829 bytes
-rw-r--r--packages/website/public/images/token_icons/POLY.pngbin0 -> 9350 bytes
-rw-r--r--packages/website/public/images/token_icons/REN.pngbin0 -> 17682 bytes
-rw-r--r--packages/website/public/images/token_icons/REP.pngbin0 -> 13905 bytes
-rw-r--r--packages/website/public/images/token_icons/REQ.pngbin0 -> 4476 bytes
-rw-r--r--packages/website/public/images/token_icons/RFR.pngbin0 -> 8319 bytes
-rw-r--r--packages/website/public/images/token_icons/RLC.pngbin0 -> 9856 bytes
-rw-r--r--packages/website/public/images/token_icons/ROL.pngbin0 -> 16279 bytes
-rw-r--r--packages/website/public/images/token_icons/RVT.pngbin0 -> 9294 bytes
-rw-r--r--packages/website/public/images/token_icons/SALT.pngbin0 -> 5912 bytes
-rw-r--r--packages/website/public/images/token_icons/SAN.pngbin0 -> 7569 bytes
-rw-r--r--packages/website/public/images/token_icons/SIG.pngbin0 -> 9885 bytes
-rw-r--r--packages/website/public/images/token_icons/SNGLS.pngbin0 -> 8475 bytes
-rw-r--r--packages/website/public/images/token_icons/SNT.pngbin0 -> 6530 bytes
-rw-r--r--packages/website/public/images/token_icons/SPANK.pngbin0 -> 16743 bytes
-rw-r--r--packages/website/public/images/token_icons/SPN.pngbin0 -> 4760 bytes
-rw-r--r--packages/website/public/images/token_icons/SS.pngbin0 -> 2576 bytes
-rw-r--r--packages/website/public/images/token_icons/STORJ.pngbin0 -> 8117 bytes
-rw-r--r--packages/website/public/images/token_icons/SUB.pngbin0 -> 15424 bytes
-rw-r--r--packages/website/public/images/token_icons/SWT.pngbin0 -> 1215 bytes
-rw-r--r--packages/website/public/images/token_icons/SXDT.pngbin0 -> 4323 bytes
-rw-r--r--packages/website/public/images/token_icons/TIME.pngbin0 -> 33752 bytes
-rw-r--r--packages/website/public/images/token_icons/TKN.pngbin0 -> 3743 bytes
-rw-r--r--packages/website/public/images/token_icons/TRL.pngbin0 -> 447936 bytes
-rw-r--r--packages/website/public/images/token_icons/TRST.pngbin0 -> 26306 bytes
-rw-r--r--packages/website/public/images/token_icons/TRX.pngbin0 -> 7941 bytes
-rw-r--r--packages/website/public/images/token_icons/UPP.pngbin0 -> 7700 bytes
-rw-r--r--packages/website/public/images/token_icons/VSL.pngbin0 -> 17717 bytes
-rw-r--r--packages/website/public/images/token_icons/WAND.pngbin0 -> 9201 bytes
-rw-r--r--packages/website/public/images/token_icons/WETH.png (renamed from packages/website/public/images/token_icons/ether_erc20.png)bin7584 -> 7584 bytes
-rw-r--r--packages/website/public/images/token_icons/WTC.pngbin0 -> 8234 bytes
-rw-r--r--packages/website/public/images/token_icons/WYV.pngbin0 -> 9261 bytes
-rw-r--r--packages/website/public/images/token_icons/XAUR.pngbin0 -> 5150 bytes
-rw-r--r--packages/website/public/images/token_icons/XNK.pngbin0 -> 4117 bytes
-rw-r--r--packages/website/public/images/token_icons/XSC.pngbin0 -> 17956 bytes
-rw-r--r--packages/website/public/images/token_icons/XYO.pngbin0 -> 13793 bytes
-rw-r--r--packages/website/public/images/token_icons/ZIL.pngbin0 -> 4444 bytes
-rw-r--r--packages/website/public/images/token_icons/ZRX.png (renamed from packages/website/public/images/token_icons/zero_ex.png)bin17905 -> 17905 bytes
-rw-r--r--packages/website/public/images/token_icons/adtoken.pngbin5150 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/aragon.pngbin14012 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/augur.pngbin23161 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/bancor.pngbin2274 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/basicattentiontoken.pngbin7082 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/bitquence.pngbin14293 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/btc.pngbin5742 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/clams.pngbin18866 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/cofound-it.pngbin5403 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/default.pngbin20225 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/digixdao.pngbin34397 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/district0x.pngbin25007 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/eos.pngbin2168 -> 6979 bytes
-rw-r--r--packages/website/public/images/token_icons/etheroll.pngbin22736 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/funfair.pngbin18800 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/gnosis.pngbin7554 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/iconomi.pngbin810 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/iexec.pngbin1910 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/lunyr.pngbin5734 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/makerdao.pngbin3161 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/metal.pngbin1295 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/monaco.pngbin6984 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/numeraire.pngbin10272 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/omisego.pngbin5976 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/santiment.pngbin4698 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/singularity.pngbin3849 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/status.pngbin3445 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/storjcoinx.pngbin9453 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/taas.pngbin7823 -> 14580 bytes
-rw-r--r--packages/website/public/images/token_icons/tokencard.pngbin14586 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/trust.pngbin14428 -> 0 bytes
-rw-r--r--packages/website/public/images/token_icons/wings.pngbin16143 -> 3822 bytes
-rw-r--r--packages/website/ts/blockchain.ts2
-rw-r--r--packages/website/ts/components/eth_wrappers.tsx7
-rw-r--r--packages/website/ts/components/generate_order/asset_picker.tsx40
-rw-r--r--packages/website/ts/utils/configs.ts43
-rw-r--r--packages/website/ts/utils/utils.ts4
179 files changed, 88 insertions, 122 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 5c23d210e..c0beac0cb 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -24,7 +24,7 @@
"compile": "sol-compiler --contracts-dir src",
"clean": "shx rm -rf lib generated_contract_wrappers",
"generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output generated_contract_wrappers --backend ethers",
- "lint": "tslint --project . --exclude **/src/generated_contract_wrappers/**/* --exclude **/lib/**/*",
+ "lint": "tslint --project . --exclude **/src/generated_contract_wrappers/**/* --exclude **/lib/**/* && yarn lint-contracts",
"coverage:report:text": "istanbul report text",
"coverage:report:html": "istanbul report html && open coverage/index.html",
"profiler:report:html": "istanbul report html && open coverage/index.html",
diff --git a/packages/contracts/src/2.0.0/forwarder/MixinERC20.sol b/packages/contracts/src/2.0.0/forwarder/MixinERC20.sol
index 387c3de6b..23c130d69 100644
--- a/packages/contracts/src/2.0.0/forwarder/MixinERC20.sol
+++ b/packages/contracts/src/2.0.0/forwarder/MixinERC20.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
contract MixinERC20 {
diff --git a/packages/contracts/src/2.0.0/forwarder/MixinWethFees.sol b/packages/contracts/src/2.0.0/forwarder/MixinWethFees.sol
index 92e2cebe8..12392be79 100644
--- a/packages/contracts/src/2.0.0/forwarder/MixinWethFees.sol
+++ b/packages/contracts/src/2.0.0/forwarder/MixinWethFees.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import { WETH9 as EtherToken } from "../tokens/WETH9/WETH9.sol";
import "../protocol/Exchange/libs/LibMath.sol";
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxy/ERC20Proxy.sol b/packages/contracts/src/2.0.0/protocol/AssetProxy/ERC20Proxy.sol
index 295974f97..b5cec6b64 100644
--- a/packages/contracts/src/2.0.0/protocol/AssetProxy/ERC20Proxy.sol
+++ b/packages/contracts/src/2.0.0/protocol/AssetProxy/ERC20Proxy.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "../../utils/LibBytes/LibBytes.sol";
import "./MixinAuthorizable.sol";
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxy/ERC721Proxy.sol b/packages/contracts/src/2.0.0/protocol/AssetProxy/ERC721Proxy.sol
index 43777d374..1f9958b43 100644
--- a/packages/contracts/src/2.0.0/protocol/AssetProxy/ERC721Proxy.sol
+++ b/packages/contracts/src/2.0.0/protocol/AssetProxy/ERC721Proxy.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "../../utils/LibBytes/LibBytes.sol";
import "./MixinAuthorizable.sol";
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxy/MixinAuthorizable.sol b/packages/contracts/src/2.0.0/protocol/AssetProxy/MixinAuthorizable.sol
index d21eac618..ff4660a31 100644
--- a/packages/contracts/src/2.0.0/protocol/AssetProxy/MixinAuthorizable.sol
+++ b/packages/contracts/src/2.0.0/protocol/AssetProxy/MixinAuthorizable.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "../../utils/Ownable/Ownable.sol";
import "./mixins/MAuthorizable.sol";
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAssetProxy.sol b/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAssetProxy.sol
index 71491f7bb..3651dd694 100644
--- a/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAssetProxy.sol
+++ b/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAssetProxy.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "./IAuthorizable.sol";
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAuthorizable.sol b/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAuthorizable.sol
index dd4c5fc65..8fac43a47 100644
--- a/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAuthorizable.sol
+++ b/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAuthorizable.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "../../../utils/Ownable/IOwnable.sol";
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxy/mixins/MAuthorizable.sol b/packages/contracts/src/2.0.0/protocol/AssetProxy/mixins/MAuthorizable.sol
index 312e1bde9..8afc8c8d8 100644
--- a/packages/contracts/src/2.0.0/protocol/AssetProxy/mixins/MAuthorizable.sol
+++ b/packages/contracts/src/2.0.0/protocol/AssetProxy/mixins/MAuthorizable.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "../interfaces/IAuthorizable.sol";
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
index cf53c3176..ec84b1e19 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
@@ -374,21 +374,19 @@ contract MixinExchangeCore is
returns (FillResults memory fillResults)
{
// Compute proportional transfer amounts
- // TODO: All three are multiplied by the same fraction. This can
- // potentially be optimized.
fillResults.takerAssetFilledAmount = takerAssetFilledAmount;
fillResults.makerAssetFilledAmount = getPartialAmount(
- fillResults.takerAssetFilledAmount,
+ takerAssetFilledAmount,
order.takerAssetAmount,
order.makerAssetAmount
);
fillResults.makerFeePaid = getPartialAmount(
- fillResults.takerAssetFilledAmount,
+ takerAssetFilledAmount,
order.takerAssetAmount,
order.makerFee
);
fillResults.takerFeePaid = getPartialAmount(
- fillResults.takerAssetFilledAmount,
+ takerAssetFilledAmount,
order.takerAssetAmount,
order.takerFee
);
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
index ba687543a..56b309a1b 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
@@ -41,7 +41,6 @@ contract MixinMatchOrders is
/// @param leftSignature Proof that order was created by the left maker.
/// @param rightSignature Proof that order was created by the right maker.
/// @return matchedFillResults Amounts filled and fees paid by maker and taker of matched orders.
- /// TODO: Make this function external once supported by Solidity (See Solidity Issues #3199, #1603)
function matchOrders(
LibOrder.Order memory leftOrder,
LibOrder.Order memory rightOrder,
@@ -184,7 +183,6 @@ contract MixinMatchOrders is
leftTakerAssetFilledAmount = leftTakerAssetAmountRemaining;
// The right order receives an amount proportional to how much was spent.
- // TODO: Can we ensure rounding error is in the correct direction?
rightTakerAssetFilledAmount = getPartialAmount(
rightOrder.takerAssetAmount,
rightOrder.makerAssetAmount,
@@ -195,7 +193,6 @@ contract MixinMatchOrders is
rightTakerAssetFilledAmount = rightTakerAssetAmountRemaining;
// The left order receives an amount proportional to how much was spent.
- // TODO: Can we ensure rounding error is in the correct direction?
leftTakerAssetFilledAmount = getPartialAmount(
rightOrder.makerAssetAmount,
rightOrder.takerAssetAmount,
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinSignatureValidator.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinSignatureValidator.sol
index 822701459..ac7382715 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinSignatureValidator.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinSignatureValidator.sol
@@ -91,7 +91,6 @@ contract MixinSignatureValidator is
view
returns (bool isValid)
{
- // TODO: Domain separation: make hash depend on role. (Taker sig should not be valid as maker sig, etc.)
require(
signature.length > 0,
"LENGTH_GREATER_THAN_0_REQUIRED"
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol
index 823e14316..88d2da7d7 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol
@@ -99,9 +99,10 @@ contract MixinTransactions is
"FAILED_EXECUTION"
);
- // Reset current transaction signer
- // TODO: Check if gas is paid when currentContextAddress is already 0.
- currentContextAddress = address(0);
+ // Reset current transaction signer if it was previously updated
+ if (signerAddress != msg.sender) {
+ currentContextAddress = address(0);
+ }
}
/// @dev Calculates EIP712 hash of the Transaction.
@@ -120,13 +121,15 @@ contract MixinTransactions is
{
bytes32 schemaHash = EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH;
bytes32 dataHash = keccak256(data);
+
// Assembly for more efficiently computing:
// keccak256(abi.encode(
- // EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH,
- // salt,
- // signerAddress,
- // keccak256(data)
- // ));
+ // EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH,
+ // salt,
+ // signerAddress,
+ // keccak256(data)
+ // ));
+
assembly {
let memPtr := mload(64)
mstore(memPtr, schemaHash)
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IMatchOrders.sol b/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IMatchOrders.sol
index cea5adbbb..73447f3ae 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IMatchOrders.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IMatchOrders.sol
@@ -33,7 +33,6 @@ contract IMatchOrders {
/// @param leftSignature Proof that order was created by the left maker.
/// @param rightSignature Proof that order was created by the right maker.
/// @return matchedFillResults Amounts filled and fees paid by maker and taker of matched orders.
- /// TODO: Make this function external once supported by Solidity (See Solidity Issues #3199, #1603)
function matchOrders(
LibOrder.Order memory leftOrder,
LibOrder.Order memory rightOrder,
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IWrapperFunctions.sol b/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IWrapperFunctions.sol
index 7c8b12724..ad7a56a06 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IWrapperFunctions.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IWrapperFunctions.sol
@@ -24,6 +24,7 @@ import "../libs/LibFillResults.sol";
contract IWrapperFunctions {
+
/// @dev Fills the input order. Reverts if exact takerAssetFillAmount not filled.
/// @param order LibOrder.Order struct containing order specifications.
/// @param takerAssetFillAmount Desired amount of takerAsset to sell.
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol
index 2ea864a5a..68f2c8aed 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol
@@ -101,21 +101,23 @@ contract LibOrder is
bytes32 schemaHash = EIP712_ORDER_SCHEMA_HASH;
bytes32 makerAssetDataHash = keccak256(order.makerAssetData);
bytes32 takerAssetDataHash = keccak256(order.takerAssetData);
+
// Assembly for more efficiently computing:
- // keccak256(abi.encode(
- // order.makerAddress,
- // order.takerAddress,
- // order.feeRecipientAddress,
- // order.senderAddress,
- // order.makerAssetAmount,
- // order.takerAssetAmount,
- // order.makerFee,
- // order.takerFee,
- // order.expirationTimeSeconds,
- // order.salt,
- // keccak256(order.makerAssetData),
- // keccak256(order.takerAssetData)
- // ));
+ // keccak256(abi.encode(
+ // order.makerAddress,
+ // order.takerAddress,
+ // order.feeRecipientAddress,
+ // order.senderAddress,
+ // order.makerAssetAmount,
+ // order.takerAssetAmount,
+ // order.makerFee,
+ // order.takerFee,
+ // order.expirationTimeSeconds,
+ // order.salt,
+ // keccak256(order.makerAssetData),
+ // keccak256(order.takerAssetData)
+ // ));
+
assembly {
// Backup
// solhint-disable-next-line space-after-comma
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MAssetProxyDispatcher.sol b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MAssetProxyDispatcher.sol
index 9207dfdc2..c6904300a 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MAssetProxyDispatcher.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MAssetProxyDispatcher.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "../interfaces/IAssetProxyDispatcher.sol";
diff --git a/packages/contracts/src/2.0.0/test/DummyERC20Token/DummyERC20Token.sol b/packages/contracts/src/2.0.0/test/DummyERC20Token/DummyERC20Token.sol
index 44b0777b8..97801166a 100644
--- a/packages/contracts/src/2.0.0/test/DummyERC20Token/DummyERC20Token.sol
+++ b/packages/contracts/src/2.0.0/test/DummyERC20Token/DummyERC20Token.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "../Mintable/Mintable.sol";
import "../../utils/Ownable/Ownable.sol";
diff --git a/packages/contracts/src/2.0.0/test/DummyERC721Token/DummyERC721Token.sol b/packages/contracts/src/2.0.0/test/DummyERC721Token/DummyERC721Token.sol
index ba647fea4..627746a52 100644
--- a/packages/contracts/src/2.0.0/test/DummyERC721Token/DummyERC721Token.sol
+++ b/packages/contracts/src/2.0.0/test/DummyERC721Token/DummyERC721Token.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "../../tokens/ERC721Token/ERC721Token.sol";
import "../../utils/Ownable/Ownable.sol";
diff --git a/packages/contracts/src/2.0.0/test/Mintable/Mintable.sol b/packages/contracts/src/2.0.0/test/Mintable/Mintable.sol
index 747ac7a86..767cc8d25 100644
--- a/packages/contracts/src/2.0.0/test/Mintable/Mintable.sol
+++ b/packages/contracts/src/2.0.0/test/Mintable/Mintable.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "../../tokens/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol";
import "../../utils/SafeMath/SafeMath.sol";
@@ -27,7 +26,10 @@ import "../../utils/SafeMath/SafeMath.sol";
* Mintable
* Base contract that creates a mintable UnlimitedAllowanceToken
*/
-contract Mintable is UnlimitedAllowanceToken, SafeMath {
+contract Mintable is
+ UnlimitedAllowanceToken,
+ SafeMath
+{
function mint(uint256 _value)
public
{
diff --git a/packages/contracts/src/2.0.0/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol b/packages/contracts/src/2.0.0/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol
index 76f1c6290..07986f4bb 100644
--- a/packages/contracts/src/2.0.0/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol
+++ b/packages/contracts/src/2.0.0/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "../../protocol/Exchange/MixinAssetProxyDispatcher.sol";
@@ -27,7 +26,8 @@ contract TestAssetProxyDispatcher is MixinAssetProxyDispatcher {
bytes memory assetData,
address from,
address to,
- uint256 amount)
+ uint256 amount
+ )
public
{
dispatchTransferFrom(assetData, from, to, amount);
diff --git a/packages/contracts/src/2.0.0/test/TestLibBytes/TestLibBytes.sol b/packages/contracts/src/2.0.0/test/TestLibBytes/TestLibBytes.sol
index 8b9c00590..00d861e61 100644
--- a/packages/contracts/src/2.0.0/test/TestLibBytes/TestLibBytes.sol
+++ b/packages/contracts/src/2.0.0/test/TestLibBytes/TestLibBytes.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "../../utils/LibBytes/LibBytes.sol";
diff --git a/packages/contracts/src/2.0.0/test/TestLibs/TestLibs.sol b/packages/contracts/src/2.0.0/test/TestLibs/TestLibs.sol
index 40e2c84dc..5a349527b 100644
--- a/packages/contracts/src/2.0.0/test/TestLibs/TestLibs.sol
+++ b/packages/contracts/src/2.0.0/test/TestLibs/TestLibs.sol
@@ -32,7 +32,8 @@ contract TestLibs is
function publicGetPartialAmount(
uint256 numerator,
uint256 denominator,
- uint256 target)
+ uint256 target
+ )
public
pure
returns (uint256 partialAmount)
@@ -48,7 +49,8 @@ contract TestLibs is
function publicIsRoundingError(
uint256 numerator,
uint256 denominator,
- uint256 target)
+ uint256 target
+ )
public
pure
returns (bool isError)
diff --git a/packages/contracts/src/2.0.0/test/TestSignatureValidator/TestSignatureValidator.sol b/packages/contracts/src/2.0.0/test/TestSignatureValidator/TestSignatureValidator.sol
index 235c77d17..e1a610469 100644
--- a/packages/contracts/src/2.0.0/test/TestSignatureValidator/TestSignatureValidator.sol
+++ b/packages/contracts/src/2.0.0/test/TestSignatureValidator/TestSignatureValidator.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "../../protocol/Exchange/MixinSignatureValidator.sol";
import "../../protocol/Exchange/MixinTransactions.sol";
diff --git a/packages/contracts/src/2.0.0/tokens/ERC20Token/ERC20Token.sol b/packages/contracts/src/2.0.0/tokens/ERC20Token/ERC20Token.sol
index 58ffdfcb6..d9950145d 100644
--- a/packages/contracts/src/2.0.0/tokens/ERC20Token/ERC20Token.sol
+++ b/packages/contracts/src/2.0.0/tokens/ERC20Token/ERC20Token.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "./IERC20Token.sol";
diff --git a/packages/contracts/src/2.0.0/tokens/ERC20Token/IERC20Token.sol b/packages/contracts/src/2.0.0/tokens/ERC20Token/IERC20Token.sol
index e3e193666..5ee5e1011 100644
--- a/packages/contracts/src/2.0.0/tokens/ERC20Token/IERC20Token.sol
+++ b/packages/contracts/src/2.0.0/tokens/ERC20Token/IERC20Token.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
contract IERC20Token {
diff --git a/packages/contracts/src/2.0.0/tokens/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol b/packages/contracts/src/2.0.0/tokens/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol
index a974503ca..9feb5c914 100644
--- a/packages/contracts/src/2.0.0/tokens/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol
+++ b/packages/contracts/src/2.0.0/tokens/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol
@@ -17,7 +17,6 @@
*/
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
import "../ERC20Token/ERC20Token.sol";
diff --git a/packages/contracts/src/2.0.0/utils/Ownable/IOwnable.sol b/packages/contracts/src/2.0.0/utils/Ownable/IOwnable.sol
index 36563d837..116b8dc89 100644
--- a/packages/contracts/src/2.0.0/utils/Ownable/IOwnable.sol
+++ b/packages/contracts/src/2.0.0/utils/Ownable/IOwnable.sol
@@ -1,5 +1,4 @@
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
/*
* Ownable
diff --git a/packages/contracts/src/2.0.0/utils/Ownable/Ownable.sol b/packages/contracts/src/2.0.0/utils/Ownable/Ownable.sol
index 81a14a447..aca65aad2 100644
--- a/packages/contracts/src/2.0.0/utils/Ownable/Ownable.sol
+++ b/packages/contracts/src/2.0.0/utils/Ownable/Ownable.sol
@@ -1,5 +1,4 @@
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
/*
* Ownable
diff --git a/packages/contracts/src/2.0.0/utils/SafeMath/SafeMath.sol b/packages/contracts/src/2.0.0/utils/SafeMath/SafeMath.sol
index 8cbb8e526..4413244db 100644
--- a/packages/contracts/src/2.0.0/utils/SafeMath/SafeMath.sol
+++ b/packages/contracts/src/2.0.0/utils/SafeMath/SafeMath.sol
@@ -1,28 +1,27 @@
pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
contract SafeMath {
- function safeMul(uint a, uint b)
+ function safeMul(uint256 a, uint256 b)
internal
pure
returns (uint256)
{
- uint c = a * b;
+ uint256 c = a * b;
assert(a == 0 || c / a == b);
return c;
}
- function safeDiv(uint a, uint b)
+ function safeDiv(uint256 a, uint256 b)
internal
pure
returns (uint256)
{
- uint c = a / b;
+ uint256 c = a / b;
return c;
}
- function safeSub(uint a, uint b)
+ function safeSub(uint256 a, uint256 b)
internal
pure
returns (uint256)
@@ -31,12 +30,12 @@ contract SafeMath {
return a - b;
}
- function safeAdd(uint a, uint b)
+ function safeAdd(uint256 a, uint256 b)
internal
pure
returns (uint256)
{
- uint c = a + b;
+ uint256 c = a + b;
assert(c >= a);
return c;
}
diff --git a/packages/website/public/images/token_icons/firstblood.jpg b/packages/website/public/images/token_icons/1ST.png
index 9cd23b10e..9cd23b10e 100644
--- a/packages/website/public/images/token_icons/firstblood.jpg
+++ b/packages/website/public/images/token_icons/1ST.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/ABYSS.png b/packages/website/public/images/token_icons/ABYSS.png
new file mode 100644
index 000000000..6ed2efef8
--- /dev/null
+++ b/packages/website/public/images/token_icons/ABYSS.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/ADT.png b/packages/website/public/images/token_icons/ADT.png
new file mode 100644
index 000000000..2e7f3f54f
--- /dev/null
+++ b/packages/website/public/images/token_icons/ADT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/AE.png b/packages/website/public/images/token_icons/AE.png
new file mode 100644
index 000000000..01dc13dda
--- /dev/null
+++ b/packages/website/public/images/token_icons/AE.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/AION.png b/packages/website/public/images/token_icons/AION.png
new file mode 100644
index 000000000..a2bfb9253
--- /dev/null
+++ b/packages/website/public/images/token_icons/AION.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/AIR.png b/packages/website/public/images/token_icons/AIR.png
new file mode 100644
index 000000000..ab3a13b6d
--- /dev/null
+++ b/packages/website/public/images/token_icons/AIR.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/ANT.png b/packages/website/public/images/token_icons/ANT.png
new file mode 100644
index 000000000..437a8f21a
--- /dev/null
+++ b/packages/website/public/images/token_icons/ANT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/APCC.png b/packages/website/public/images/token_icons/APCC.png
new file mode 100644
index 000000000..4294618be
--- /dev/null
+++ b/packages/website/public/images/token_icons/APCC.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/APPC.png b/packages/website/public/images/token_icons/APPC.png
new file mode 100644
index 000000000..4294618be
--- /dev/null
+++ b/packages/website/public/images/token_icons/APPC.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/ARN.png b/packages/website/public/images/token_icons/ARN.png
new file mode 100644
index 000000000..0d17bb0dd
--- /dev/null
+++ b/packages/website/public/images/token_icons/ARN.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/ART.png b/packages/website/public/images/token_icons/ART.png
new file mode 100644
index 000000000..194f58fa0
--- /dev/null
+++ b/packages/website/public/images/token_icons/ART.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/AST.png b/packages/website/public/images/token_icons/AST.png
new file mode 100644
index 000000000..25d7c00ee
--- /dev/null
+++ b/packages/website/public/images/token_icons/AST.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/BAT.png b/packages/website/public/images/token_icons/BAT.png
new file mode 100644
index 000000000..840ed0a16
--- /dev/null
+++ b/packages/website/public/images/token_icons/BAT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/BCAP.png b/packages/website/public/images/token_icons/BCAP.png
new file mode 100644
index 000000000..acf50e368
--- /dev/null
+++ b/packages/website/public/images/token_icons/BCAP.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/BCPT.png b/packages/website/public/images/token_icons/BCPT.png
new file mode 100644
index 000000000..e1ecbeafe
--- /dev/null
+++ b/packages/website/public/images/token_icons/BCPT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/BNT.png b/packages/website/public/images/token_icons/BNT.png
new file mode 100644
index 000000000..a3b91ec34
--- /dev/null
+++ b/packages/website/public/images/token_icons/BNT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/BRM.png b/packages/website/public/images/token_icons/BRM.png
new file mode 100644
index 000000000..109c21ef5
--- /dev/null
+++ b/packages/website/public/images/token_icons/BRM.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/CAG.png b/packages/website/public/images/token_icons/CAG.png
new file mode 100644
index 000000000..2aa368381
--- /dev/null
+++ b/packages/website/public/images/token_icons/CAG.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/CAN.png b/packages/website/public/images/token_icons/CAN.png
new file mode 100644
index 000000000..7fdf3a9b9
--- /dev/null
+++ b/packages/website/public/images/token_icons/CAN.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/CAT.png b/packages/website/public/images/token_icons/CAT.png
new file mode 100644
index 000000000..c59b6b15d
--- /dev/null
+++ b/packages/website/public/images/token_icons/CAT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/CFI.png b/packages/website/public/images/token_icons/CFI.png
new file mode 100644
index 000000000..b1f2e6db9
--- /dev/null
+++ b/packages/website/public/images/token_icons/CFI.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/civic.png b/packages/website/public/images/token_icons/CVC.png
index 1daf28d00..1daf28d00 100644
--- a/packages/website/public/images/token_icons/civic.png
+++ b/packages/website/public/images/token_icons/CVC.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/DAI.png b/packages/website/public/images/token_icons/DAI.png
new file mode 100644
index 000000000..bf7da4a01
--- /dev/null
+++ b/packages/website/public/images/token_icons/DAI.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/DATA.png b/packages/website/public/images/token_icons/DATA.png
new file mode 100644
index 000000000..43f2e6dde
--- /dev/null
+++ b/packages/website/public/images/token_icons/DATA.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/DEB.png b/packages/website/public/images/token_icons/DEB.png
new file mode 100644
index 000000000..c729fd265
--- /dev/null
+++ b/packages/website/public/images/token_icons/DEB.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/DGD.png b/packages/website/public/images/token_icons/DGD.png
new file mode 100644
index 000000000..cb81ecb45
--- /dev/null
+++ b/packages/website/public/images/token_icons/DGD.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/DIVX.png b/packages/website/public/images/token_icons/DIVX.png
new file mode 100644
index 000000000..d8d50f1f8
--- /dev/null
+++ b/packages/website/public/images/token_icons/DIVX.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/DNT.png b/packages/website/public/images/token_icons/DNT.png
new file mode 100644
index 000000000..b4ac550f6
--- /dev/null
+++ b/packages/website/public/images/token_icons/DNT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/edgeless.png b/packages/website/public/images/token_icons/EDG.png
index 606784154..606784154 100644
--- a/packages/website/public/images/token_icons/edgeless.png
+++ b/packages/website/public/images/token_icons/EDG.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/EDU.png b/packages/website/public/images/token_icons/EDU.png
new file mode 100644
index 000000000..d74785e5a
--- /dev/null
+++ b/packages/website/public/images/token_icons/EDU.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/ELEC.png b/packages/website/public/images/token_icons/ELEC.png
new file mode 100644
index 000000000..cc1a3745a
--- /dev/null
+++ b/packages/website/public/images/token_icons/ELEC.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/EMONT.png b/packages/website/public/images/token_icons/EMONT.png
new file mode 100644
index 000000000..ba7fe4a3d
--- /dev/null
+++ b/packages/website/public/images/token_icons/EMONT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/ENG.png b/packages/website/public/images/token_icons/ENG.png
new file mode 100644
index 000000000..6f83a35ea
--- /dev/null
+++ b/packages/website/public/images/token_icons/ENG.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/ENTR.png b/packages/website/public/images/token_icons/ENTR.png
new file mode 100644
index 000000000..2936c20e2
--- /dev/null
+++ b/packages/website/public/images/token_icons/ENTR.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/EVE.png b/packages/website/public/images/token_icons/EVE.png
new file mode 100644
index 000000000..d78362134
--- /dev/null
+++ b/packages/website/public/images/token_icons/EVE.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/FUN.png b/packages/website/public/images/token_icons/FUN.png
new file mode 100644
index 000000000..a473a1c72
--- /dev/null
+++ b/packages/website/public/images/token_icons/FUN.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/GEE.png b/packages/website/public/images/token_icons/GEE.png
new file mode 100644
index 000000000..887cc8429
--- /dev/null
+++ b/packages/website/public/images/token_icons/GEE.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/GEN.png b/packages/website/public/images/token_icons/GEN.png
new file mode 100644
index 000000000..b1fe28370
--- /dev/null
+++ b/packages/website/public/images/token_icons/GEN.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/GET.png b/packages/website/public/images/token_icons/GET.png
new file mode 100644
index 000000000..6a5fbdf63
--- /dev/null
+++ b/packages/website/public/images/token_icons/GET.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/GNO.png b/packages/website/public/images/token_icons/GNO.png
new file mode 100644
index 000000000..7c7d09433
--- /dev/null
+++ b/packages/website/public/images/token_icons/GNO.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/golem.png b/packages/website/public/images/token_icons/GNT.png
index e61a4367d..e61a4367d 100644
--- a/packages/website/public/images/token_icons/golem.png
+++ b/packages/website/public/images/token_icons/GNT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/HGT.png b/packages/website/public/images/token_icons/HGT.png
new file mode 100644
index 000000000..b35c601a3
--- /dev/null
+++ b/packages/website/public/images/token_icons/HGT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/HOT.png b/packages/website/public/images/token_icons/HOT.png
new file mode 100644
index 000000000..0c7f61755
--- /dev/null
+++ b/packages/website/public/images/token_icons/HOT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/ICN.png b/packages/website/public/images/token_icons/ICN.png
new file mode 100644
index 000000000..e7eebad10
--- /dev/null
+++ b/packages/website/public/images/token_icons/ICN.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/IND.png b/packages/website/public/images/token_icons/IND.png
new file mode 100644
index 000000000..edc3d217b
--- /dev/null
+++ b/packages/website/public/images/token_icons/IND.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/J8T.png b/packages/website/public/images/token_icons/J8T.png
new file mode 100644
index 000000000..74a2f4855
--- /dev/null
+++ b/packages/website/public/images/token_icons/J8T.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/JET.png b/packages/website/public/images/token_icons/JET.png
new file mode 100644
index 000000000..f34a28481
--- /dev/null
+++ b/packages/website/public/images/token_icons/JET.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/KIN.png b/packages/website/public/images/token_icons/KIN.png
new file mode 100644
index 000000000..a38d656e1
--- /dev/null
+++ b/packages/website/public/images/token_icons/KIN.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/KNC.png b/packages/website/public/images/token_icons/KNC.png
new file mode 100644
index 000000000..7ebe359b7
--- /dev/null
+++ b/packages/website/public/images/token_icons/KNC.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/LINK.png b/packages/website/public/images/token_icons/LINK.png
new file mode 100644
index 000000000..0873f72c9
--- /dev/null
+++ b/packages/website/public/images/token_icons/LINK.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/LOOM.png b/packages/website/public/images/token_icons/LOOM.png
new file mode 100644
index 000000000..0da2c41c9
--- /dev/null
+++ b/packages/website/public/images/token_icons/LOOM.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/LUN.png b/packages/website/public/images/token_icons/LUN.png
new file mode 100644
index 000000000..d661bdc9f
--- /dev/null
+++ b/packages/website/public/images/token_icons/LUN.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/MANA.png b/packages/website/public/images/token_icons/MANA.png
new file mode 100644
index 000000000..52cdffa69
--- /dev/null
+++ b/packages/website/public/images/token_icons/MANA.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/MCO.png b/packages/website/public/images/token_icons/MCO.png
new file mode 100644
index 000000000..7c3c5bfa0
--- /dev/null
+++ b/packages/website/public/images/token_icons/MCO.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/MKR.png b/packages/website/public/images/token_icons/MKR.png
new file mode 100644
index 000000000..6da588979
--- /dev/null
+++ b/packages/website/public/images/token_icons/MKR.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/melon.png b/packages/website/public/images/token_icons/MLN.png
index 29f58e631..29f58e631 100644
--- a/packages/website/public/images/token_icons/melon.png
+++ b/packages/website/public/images/token_icons/MLN.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/MOD.png b/packages/website/public/images/token_icons/MOD.png
new file mode 100644
index 000000000..4fbe66b83
--- /dev/null
+++ b/packages/website/public/images/token_icons/MOD.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/MORPH.png b/packages/website/public/images/token_icons/MORPH.png
new file mode 100644
index 000000000..a9a8dd067
--- /dev/null
+++ b/packages/website/public/images/token_icons/MORPH.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/MOT.png b/packages/website/public/images/token_icons/MOT.png
new file mode 100644
index 000000000..b5457f9f1
--- /dev/null
+++ b/packages/website/public/images/token_icons/MOT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/MTL.png b/packages/website/public/images/token_icons/MTL.png
new file mode 100644
index 000000000..3297462ce
--- /dev/null
+++ b/packages/website/public/images/token_icons/MTL.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/NANJ.png b/packages/website/public/images/token_icons/NANJ.png
new file mode 100644
index 000000000..0c54c5bde
--- /dev/null
+++ b/packages/website/public/images/token_icons/NANJ.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/NAVI.png b/packages/website/public/images/token_icons/NAVI.png
new file mode 100644
index 000000000..3dc359c47
--- /dev/null
+++ b/packages/website/public/images/token_icons/NAVI.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/NCT.png b/packages/website/public/images/token_icons/NCT.png
new file mode 100644
index 000000000..879c8d085
--- /dev/null
+++ b/packages/website/public/images/token_icons/NCT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/NDC.png b/packages/website/public/images/token_icons/NDC.png
new file mode 100644
index 000000000..b16890ca3
--- /dev/null
+++ b/packages/website/public/images/token_icons/NDC.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/NEXO.png b/packages/website/public/images/token_icons/NEXO.png
new file mode 100644
index 000000000..f6459a39f
--- /dev/null
+++ b/packages/website/public/images/token_icons/NEXO.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/NMR.png b/packages/website/public/images/token_icons/NMR.png
new file mode 100644
index 000000000..8767f019a
--- /dev/null
+++ b/packages/website/public/images/token_icons/NMR.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/OAX.png b/packages/website/public/images/token_icons/OAX.png
new file mode 100644
index 000000000..7a53e71af
--- /dev/null
+++ b/packages/website/public/images/token_icons/OAX.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/OCC.png b/packages/website/public/images/token_icons/OCC.png
new file mode 100644
index 000000000..049812208
--- /dev/null
+++ b/packages/website/public/images/token_icons/OCC.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/OMG.png b/packages/website/public/images/token_icons/OMG.png
new file mode 100644
index 000000000..c1552abf2
--- /dev/null
+++ b/packages/website/public/images/token_icons/OMG.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/OMX.png b/packages/website/public/images/token_icons/OMX.png
new file mode 100644
index 000000000..0c3485d79
--- /dev/null
+++ b/packages/website/public/images/token_icons/OMX.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/PAL.png b/packages/website/public/images/token_icons/PAL.png
new file mode 100644
index 000000000..211e42ea5
--- /dev/null
+++ b/packages/website/public/images/token_icons/PAL.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/tenx.png b/packages/website/public/images/token_icons/PAY.png
index d9ffca043..d9ffca043 100644
--- a/packages/website/public/images/token_icons/tenx.png
+++ b/packages/website/public/images/token_icons/PAY.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/PKT.png b/packages/website/public/images/token_icons/PKT.png
new file mode 100644
index 000000000..169390929
--- /dev/null
+++ b/packages/website/public/images/token_icons/PKT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/PLAY.png b/packages/website/public/images/token_icons/PLAY.png
new file mode 100644
index 000000000..9b141a6ec
--- /dev/null
+++ b/packages/website/public/images/token_icons/PLAY.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/PLU.png b/packages/website/public/images/token_icons/PLU.png
new file mode 100644
index 000000000..6f9b0344e
--- /dev/null
+++ b/packages/website/public/images/token_icons/PLU.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/POLY.png b/packages/website/public/images/token_icons/POLY.png
new file mode 100644
index 000000000..03ded07dc
--- /dev/null
+++ b/packages/website/public/images/token_icons/POLY.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/REN.png b/packages/website/public/images/token_icons/REN.png
new file mode 100644
index 000000000..f70856e9f
--- /dev/null
+++ b/packages/website/public/images/token_icons/REN.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/REP.png b/packages/website/public/images/token_icons/REP.png
new file mode 100644
index 000000000..c767f4b6f
--- /dev/null
+++ b/packages/website/public/images/token_icons/REP.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/REQ.png b/packages/website/public/images/token_icons/REQ.png
new file mode 100644
index 000000000..3c0e8ed9a
--- /dev/null
+++ b/packages/website/public/images/token_icons/REQ.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/RFR.png b/packages/website/public/images/token_icons/RFR.png
new file mode 100644
index 000000000..05d71c4f3
--- /dev/null
+++ b/packages/website/public/images/token_icons/RFR.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/RLC.png b/packages/website/public/images/token_icons/RLC.png
new file mode 100644
index 000000000..c21dee4c4
--- /dev/null
+++ b/packages/website/public/images/token_icons/RLC.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/ROL.png b/packages/website/public/images/token_icons/ROL.png
new file mode 100644
index 000000000..430fa9af1
--- /dev/null
+++ b/packages/website/public/images/token_icons/ROL.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/RVT.png b/packages/website/public/images/token_icons/RVT.png
new file mode 100644
index 000000000..4f32c0e87
--- /dev/null
+++ b/packages/website/public/images/token_icons/RVT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/SALT.png b/packages/website/public/images/token_icons/SALT.png
new file mode 100644
index 000000000..ce425eed5
--- /dev/null
+++ b/packages/website/public/images/token_icons/SALT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/SAN.png b/packages/website/public/images/token_icons/SAN.png
new file mode 100644
index 000000000..36aa6a554
--- /dev/null
+++ b/packages/website/public/images/token_icons/SAN.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/SIG.png b/packages/website/public/images/token_icons/SIG.png
new file mode 100644
index 000000000..33af7f085
--- /dev/null
+++ b/packages/website/public/images/token_icons/SIG.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/SNGLS.png b/packages/website/public/images/token_icons/SNGLS.png
new file mode 100644
index 000000000..16bf28819
--- /dev/null
+++ b/packages/website/public/images/token_icons/SNGLS.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/SNT.png b/packages/website/public/images/token_icons/SNT.png
new file mode 100644
index 000000000..6f072cffb
--- /dev/null
+++ b/packages/website/public/images/token_icons/SNT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/SPANK.png b/packages/website/public/images/token_icons/SPANK.png
new file mode 100644
index 000000000..aab84ef90
--- /dev/null
+++ b/packages/website/public/images/token_icons/SPANK.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/SPN.png b/packages/website/public/images/token_icons/SPN.png
new file mode 100644
index 000000000..c569c4687
--- /dev/null
+++ b/packages/website/public/images/token_icons/SPN.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/SS.png b/packages/website/public/images/token_icons/SS.png
new file mode 100644
index 000000000..127e42c45
--- /dev/null
+++ b/packages/website/public/images/token_icons/SS.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/STORJ.png b/packages/website/public/images/token_icons/STORJ.png
new file mode 100644
index 000000000..4539afb4a
--- /dev/null
+++ b/packages/website/public/images/token_icons/STORJ.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/SUB.png b/packages/website/public/images/token_icons/SUB.png
new file mode 100644
index 000000000..633bcbbd1
--- /dev/null
+++ b/packages/website/public/images/token_icons/SUB.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/SWT.png b/packages/website/public/images/token_icons/SWT.png
new file mode 100644
index 000000000..910d9fdbf
--- /dev/null
+++ b/packages/website/public/images/token_icons/SWT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/SXDT.png b/packages/website/public/images/token_icons/SXDT.png
new file mode 100644
index 000000000..b37e92050
--- /dev/null
+++ b/packages/website/public/images/token_icons/SXDT.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/TIME.png b/packages/website/public/images/token_icons/TIME.png
new file mode 100644
index 000000000..920cc7636
--- /dev/null
+++ b/packages/website/public/images/token_icons/TIME.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/TKN.png b/packages/website/public/images/token_icons/TKN.png
new file mode 100644
index 000000000..e1b276416
--- /dev/null
+++ b/packages/website/public/images/token_icons/TKN.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/TRL.png b/packages/website/public/images/token_icons/TRL.png
new file mode 100644
index 000000000..afd5815ba
--- /dev/null
+++ b/packages/website/public/images/token_icons/TRL.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/TRST.png b/packages/website/public/images/token_icons/TRST.png
new file mode 100644
index 000000000..0ba34778f
--- /dev/null
+++ b/packages/website/public/images/token_icons/TRST.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/TRX.png b/packages/website/public/images/token_icons/TRX.png
new file mode 100644
index 000000000..56338957c
--- /dev/null
+++ b/packages/website/public/images/token_icons/TRX.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/UPP.png b/packages/website/public/images/token_icons/UPP.png
new file mode 100644
index 000000000..bc90081a0
--- /dev/null
+++ b/packages/website/public/images/token_icons/UPP.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/VSL.png b/packages/website/public/images/token_icons/VSL.png
new file mode 100644
index 000000000..b3d0950d2
--- /dev/null
+++ b/packages/website/public/images/token_icons/VSL.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/WAND.png b/packages/website/public/images/token_icons/WAND.png
new file mode 100644
index 000000000..e22531e21
--- /dev/null
+++ b/packages/website/public/images/token_icons/WAND.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/ether_erc20.png b/packages/website/public/images/token_icons/WETH.png
index bc8beae8b..bc8beae8b 100644
--- a/packages/website/public/images/token_icons/ether_erc20.png
+++ b/packages/website/public/images/token_icons/WETH.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/WTC.png b/packages/website/public/images/token_icons/WTC.png
new file mode 100644
index 000000000..06aac0617
--- /dev/null
+++ b/packages/website/public/images/token_icons/WTC.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/WYV.png b/packages/website/public/images/token_icons/WYV.png
new file mode 100644
index 000000000..d63aa857b
--- /dev/null
+++ b/packages/website/public/images/token_icons/WYV.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/XAUR.png b/packages/website/public/images/token_icons/XAUR.png
new file mode 100644
index 000000000..c356cc9dd
--- /dev/null
+++ b/packages/website/public/images/token_icons/XAUR.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/XNK.png b/packages/website/public/images/token_icons/XNK.png
new file mode 100644
index 000000000..04b2ebf80
--- /dev/null
+++ b/packages/website/public/images/token_icons/XNK.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/XSC.png b/packages/website/public/images/token_icons/XSC.png
new file mode 100644
index 000000000..7f70686aa
--- /dev/null
+++ b/packages/website/public/images/token_icons/XSC.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/XYO.png b/packages/website/public/images/token_icons/XYO.png
new file mode 100644
index 000000000..81314d2ff
--- /dev/null
+++ b/packages/website/public/images/token_icons/XYO.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/ZIL.png b/packages/website/public/images/token_icons/ZIL.png
new file mode 100644
index 000000000..197227803
--- /dev/null
+++ b/packages/website/public/images/token_icons/ZIL.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/zero_ex.png b/packages/website/public/images/token_icons/ZRX.png
index 8ed9a984b..8ed9a984b 100644
--- a/packages/website/public/images/token_icons/zero_ex.png
+++ b/packages/website/public/images/token_icons/ZRX.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/adtoken.png b/packages/website/public/images/token_icons/adtoken.png
deleted file mode 100644
index 59290af6b..000000000
--- a/packages/website/public/images/token_icons/adtoken.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/aragon.png b/packages/website/public/images/token_icons/aragon.png
deleted file mode 100644
index d162aab24..000000000
--- a/packages/website/public/images/token_icons/aragon.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/augur.png b/packages/website/public/images/token_icons/augur.png
deleted file mode 100644
index b7d61100a..000000000
--- a/packages/website/public/images/token_icons/augur.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/bancor.png b/packages/website/public/images/token_icons/bancor.png
deleted file mode 100644
index d2b2fa472..000000000
--- a/packages/website/public/images/token_icons/bancor.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/basicattentiontoken.png b/packages/website/public/images/token_icons/basicattentiontoken.png
deleted file mode 100644
index 77e7dfb1f..000000000
--- a/packages/website/public/images/token_icons/basicattentiontoken.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/bitquence.png b/packages/website/public/images/token_icons/bitquence.png
deleted file mode 100644
index d8a2c6960..000000000
--- a/packages/website/public/images/token_icons/bitquence.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/btc.png b/packages/website/public/images/token_icons/btc.png
deleted file mode 100644
index 1d9fc8347..000000000
--- a/packages/website/public/images/token_icons/btc.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/clams.png b/packages/website/public/images/token_icons/clams.png
deleted file mode 100644
index 04c2ba7d3..000000000
--- a/packages/website/public/images/token_icons/clams.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/cofound-it.png b/packages/website/public/images/token_icons/cofound-it.png
deleted file mode 100644
index 7bccd6248..000000000
--- a/packages/website/public/images/token_icons/cofound-it.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/default.png b/packages/website/public/images/token_icons/default.png
deleted file mode 100644
index 5c9ea4b0f..000000000
--- a/packages/website/public/images/token_icons/default.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/digixdao.png b/packages/website/public/images/token_icons/digixdao.png
deleted file mode 100644
index f292db716..000000000
--- a/packages/website/public/images/token_icons/digixdao.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/district0x.png b/packages/website/public/images/token_icons/district0x.png
deleted file mode 100644
index 7427b1146..000000000
--- a/packages/website/public/images/token_icons/district0x.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/eos.png b/packages/website/public/images/token_icons/eos.png
index a08f3c042..622df61bc 100644
--- a/packages/website/public/images/token_icons/eos.png
+++ b/packages/website/public/images/token_icons/eos.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/etheroll.png b/packages/website/public/images/token_icons/etheroll.png
deleted file mode 100644
index 89dd5e04b..000000000
--- a/packages/website/public/images/token_icons/etheroll.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/funfair.png b/packages/website/public/images/token_icons/funfair.png
deleted file mode 100644
index 1b7c67ec6..000000000
--- a/packages/website/public/images/token_icons/funfair.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/gnosis.png b/packages/website/public/images/token_icons/gnosis.png
deleted file mode 100644
index 0111846d0..000000000
--- a/packages/website/public/images/token_icons/gnosis.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/iconomi.png b/packages/website/public/images/token_icons/iconomi.png
deleted file mode 100644
index 3499e4765..000000000
--- a/packages/website/public/images/token_icons/iconomi.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/iexec.png b/packages/website/public/images/token_icons/iexec.png
deleted file mode 100644
index ef4860457..000000000
--- a/packages/website/public/images/token_icons/iexec.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/lunyr.png b/packages/website/public/images/token_icons/lunyr.png
deleted file mode 100644
index f77094ba5..000000000
--- a/packages/website/public/images/token_icons/lunyr.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/makerdao.png b/packages/website/public/images/token_icons/makerdao.png
deleted file mode 100644
index adbc9f38c..000000000
--- a/packages/website/public/images/token_icons/makerdao.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/metal.png b/packages/website/public/images/token_icons/metal.png
deleted file mode 100644
index d8a8c33ec..000000000
--- a/packages/website/public/images/token_icons/metal.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/monaco.png b/packages/website/public/images/token_icons/monaco.png
deleted file mode 100644
index 865341fd3..000000000
--- a/packages/website/public/images/token_icons/monaco.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/numeraire.png b/packages/website/public/images/token_icons/numeraire.png
deleted file mode 100644
index 698f7cfdd..000000000
--- a/packages/website/public/images/token_icons/numeraire.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/omisego.png b/packages/website/public/images/token_icons/omisego.png
deleted file mode 100644
index 40a86b9d7..000000000
--- a/packages/website/public/images/token_icons/omisego.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/santiment.png b/packages/website/public/images/token_icons/santiment.png
deleted file mode 100644
index 05ce98c1d..000000000
--- a/packages/website/public/images/token_icons/santiment.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/singularity.png b/packages/website/public/images/token_icons/singularity.png
deleted file mode 100644
index 9db788935..000000000
--- a/packages/website/public/images/token_icons/singularity.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/status.png b/packages/website/public/images/token_icons/status.png
deleted file mode 100644
index a73ba23ba..000000000
--- a/packages/website/public/images/token_icons/status.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/storjcoinx.png b/packages/website/public/images/token_icons/storjcoinx.png
deleted file mode 100644
index 87c4d4292..000000000
--- a/packages/website/public/images/token_icons/storjcoinx.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/taas.png b/packages/website/public/images/token_icons/taas.png
index 4cca722f7..266e3690b 100644
--- a/packages/website/public/images/token_icons/taas.png
+++ b/packages/website/public/images/token_icons/taas.png
Binary files differ
diff --git a/packages/website/public/images/token_icons/tokencard.png b/packages/website/public/images/token_icons/tokencard.png
deleted file mode 100644
index 490c1be69..000000000
--- a/packages/website/public/images/token_icons/tokencard.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/trust.png b/packages/website/public/images/token_icons/trust.png
deleted file mode 100644
index 62b412b41..000000000
--- a/packages/website/public/images/token_icons/trust.png
+++ /dev/null
Binary files differ
diff --git a/packages/website/public/images/token_icons/wings.png b/packages/website/public/images/token_icons/wings.png
index cd0eb4213..c0a9ce527 100644
--- a/packages/website/public/images/token_icons/wings.png
+++ b/packages/website/public/images/token_icons/wings.png
Binary files differ
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index ddf2b3989..fde134b18 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -774,7 +774,7 @@ export class Blockchain {
_.each(tokenRegistryTokens, (t: ZeroExToken) => {
// HACK: For now we have a hard-coded list of iconUrls for the dummyTokens
// TODO: Refactor this out and pull the iconUrl directly from the TokenRegistry
- const iconUrl = configs.ICON_URL_BY_SYMBOL[t.symbol];
+ const iconUrl = utils.getTokenIconUrl(t.symbol);
const token: Token = {
iconUrl,
address: t.address,
diff --git a/packages/website/ts/components/eth_wrappers.tsx b/packages/website/ts/components/eth_wrappers.tsx
index 20b446155..0b282b2a1 100644
--- a/packages/website/ts/components/eth_wrappers.tsx
+++ b/packages/website/ts/components/eth_wrappers.tsx
@@ -20,6 +20,7 @@ import {
} from 'ts/types';
import { configs } from 'ts/utils/configs';
import { constants } from 'ts/utils/constants';
+import { utils } from 'ts/utils/utils';
const DATE_FORMAT = 'D/M/YY';
const ICON_DIMENSION = 40;
@@ -95,7 +96,11 @@ export class EthWrappers extends React.Component<EthWrappersProps, EthWrappersSt
this.props.networkId,
EtherscanLinkSuffixes.Address,
);
- const tokenLabel = this._renderToken('Wrapped Ether', etherToken.address, configs.ICON_URL_BY_SYMBOL.WETH);
+ const tokenLabel = this._renderToken(
+ 'Wrapped Ether',
+ etherToken.address,
+ utils.getTokenIconUrl(etherToken.symbol),
+ );
const userEtherBalanceInEth = !_.isUndefined(this.props.userEtherBalanceInWei)
? Web3Wrapper.toUnitAmount(this.props.userEtherBalanceInWei, constants.DECIMAL_PLACES_ETH)
: undefined;
diff --git a/packages/website/ts/components/generate_order/asset_picker.tsx b/packages/website/ts/components/generate_order/asset_picker.tsx
index 3d53a9e7d..5eada37b6 100644
--- a/packages/website/ts/components/generate_order/asset_picker.tsx
+++ b/packages/website/ts/components/generate_order/asset_picker.tsx
@@ -3,6 +3,8 @@ import Dialog from 'material-ui/Dialog';
import FlatButton from 'material-ui/FlatButton';
import * as moment from 'moment';
import * as React from 'react';
+import firstBy = require('thenby');
+
import { Blockchain } from 'ts/blockchain';
import { NewTokenForm } from 'ts/components/generate_order/new_token_form';
import { TrackTokenConfirmation } from 'ts/components/track_token_confirmation';
@@ -87,10 +89,10 @@ export class AssetPicker extends React.Component<AssetPickerProps, AssetPickerSt
return (
<Dialog
title={dialogConfigs.title}
- titleStyle={{ fontWeight: 100 }}
modal={dialogConfigs.isModal}
open={this.props.isOpen}
actions={dialogConfigs.actions}
+ autoScrollBodyContent={true}
onRequestClose={this._onCloseDialog.bind(this)}
>
{this.state.assetView === AssetViews.ASSET_PICKER && this._renderAssetPicker()}
@@ -121,9 +123,8 @@ export class AssetPicker extends React.Component<AssetPickerProps, AssetPickerSt
<div
className="flex flex-wrap"
style={{
- overflowY: 'auto',
- maxWidth: 720,
- maxHeight: 356,
+ maxWidth: 1000,
+ maxHeight: 600,
marginBottom: 10,
}}
>
@@ -134,15 +135,28 @@ export class AssetPicker extends React.Component<AssetPickerProps, AssetPickerSt
private _renderGridTiles(): React.ReactNode {
let isHovered;
let tileStyles;
- const gridTiles = _.map(this.props.tokenByAddress, (token: Token, address: string) => {
- if (
- (this.props.tokenVisibility === TokenVisibility.TRACKED && !utils.isTokenTracked(token)) ||
- (this.props.tokenVisibility === TokenVisibility.UNTRACKED && utils.isTokenTracked(token)) ||
- token.symbol === constants.ZRX_TOKEN_SYMBOL ||
- token.symbol === constants.ETHER_TOKEN_SYMBOL
- ) {
- return null; // Skip
- }
+ const allTokens = _.values(this.props.tokenByAddress);
+ // filter tokens based on visibility specified in props, do not show ZRX or ETHER as tracked or untracked
+ const filteredTokens =
+ this.props.tokenVisibility === TokenVisibility.ALL
+ ? allTokens
+ : _.filter(allTokens, token => {
+ return (
+ token.symbol !== constants.ZRX_TOKEN_SYMBOL &&
+ token.symbol !== constants.ETHER_TOKEN_SYMBOL &&
+ ((this.props.tokenVisibility === TokenVisibility.TRACKED && utils.isTokenTracked(token)) ||
+ (this.props.tokenVisibility === TokenVisibility.UNTRACKED &&
+ !utils.isTokenTracked(token)))
+ );
+ });
+ // if we are showing tracked tokens, sort by date added, otherwise sort by symbol
+ const sortKey = this.props.tokenVisibility === TokenVisibility.TRACKED ? 'trackedTimestamp' : 'symbol';
+ const sortedTokens = filteredTokens.sort(firstBy(sortKey));
+ if (_.isEmpty(sortedTokens)) {
+ return <div className="mx-auto p4 h2">No tokens to remove.</div>;
+ }
+ const gridTiles = _.map(sortedTokens, token => {
+ const address = token.address;
isHovered = this.state.hoveredAddress === address;
tileStyles = {
cursor: 'pointer',
diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts
index e8a486c35..97aabd13d 100644
--- a/packages/website/ts/utils/configs.ts
+++ b/packages/website/ts/utils/configs.ts
@@ -22,50 +22,9 @@ export const configs = {
DOMAIN_DEVELOPMENT: '0xproject.localhost:3572',
DOMAIN_PRODUCTION: '0xproject.com',
ENVIRONMENT: isDevelopment ? Environments.DEVELOPMENT : Environments.PRODUCTION,
- ICON_URL_BY_SYMBOL: {
- REP: '/images/token_icons/augur.png',
- DGD: '/images/token_icons/digixdao.png',
- WETH: '/images/token_icons/ether_erc20.png',
- MLN: '/images/token_icons/melon.png',
- GNT: '/images/token_icons/golem.png',
- MKR: '/images/token_icons/makerdao.png',
- ZRX: '/images/token_icons/zero_ex.png',
- ANT: '/images/token_icons/aragon.png',
- BNT: '/images/token_icons/bancor.png',
- BAT: '/images/token_icons/basicattentiontoken.png',
- CVC: '/images/token_icons/civic.png',
- EOS: '/images/token_icons/eos.png',
- FUN: '/images/token_icons/funfair.png',
- GNO: '/images/token_icons/gnosis.png',
- ICN: '/images/token_icons/iconomi.png',
- OMG: '/images/token_icons/omisego.png',
- SNT: '/images/token_icons/status.png',
- STORJ: '/images/token_icons/storjcoinx.png',
- PAY: '/images/token_icons/tenx.png',
- QTUM: '/images/token_icons/qtum.png',
- DNT: '/images/token_icons/district0x.png',
- SNGLS: '/images/token_icons/singularity.png',
- EDG: '/images/token_icons/edgeless.png',
- '1ST': '/images/token_icons/firstblood.jpg',
- WINGS: '/images/token_icons/wings.png',
- BQX: '/images/token_icons/bitquence.png',
- LUN: '/images/token_icons/lunyr.png',
- RLC: '/images/token_icons/iexec.png',
- MCO: '/images/token_icons/monaco.png',
- ADT: '/images/token_icons/adtoken.png',
- CFI: '/images/token_icons/cofound-it.png',
- ROL: '/images/token_icons/etheroll.png',
- WGNT: '/images/token_icons/golem.png',
- MTL: '/images/token_icons/metal.png',
- NMR: '/images/token_icons/numeraire.png',
- SAN: '/images/token_icons/santiment.png',
- TAAS: '/images/token_icons/taas.png',
- TKN: '/images/token_icons/tokencard.png',
- TRST: '/images/token_icons/trust.png',
- } as { [symbol: string]: string },
GOOGLE_ANALYTICS_ID: 'UA-98720122-1',
LAST_LOCAL_STORAGE_FILL_CLEARANCE_DATE: '2017-11-22',
- LAST_LOCAL_STORAGE_TRACKED_TOKEN_CLEARANCE_DATE: '2018-6-25',
+ LAST_LOCAL_STORAGE_TRACKED_TOKEN_CLEARANCE_DATE: '2018-7-5',
OUTDATED_WRAPPED_ETHERS: [
{
42: {
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index 6ab642f53..6af7f5613 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -474,4 +474,8 @@ export const utils = {
}
return [downloadLink, isOnMobile];
},
+ getTokenIconUrl(symbol: string): string {
+ const result = `/images/token_icons/${symbol}.png`;
+ return result;
+ },
};