Skip to content
This repository has been archived by the owner on Nov 21, 2019. It is now read-only.

devop/sync-repo #1972

Merged
merged 1 commit into from
Jul 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
### Release v3.21.18
### New
- Add CRGO and TICO token, add Havven ABI []()
- Add Kyber and MEW token contracts [#1971](https://github.com/kvhnuke/etherwallet/pull/1971)
- Add CAR, and TSW token, remove WPC token and update AXP to AXPR [#1970](https://github.com/kvhnuke/etherwallet/pull/1970)
- Add WNK token [#1967](https://github.com/kvhnuke/etherwallet/pull/1967)
Expand Down
6 changes: 6 additions & 0 deletions app/scripts/abiDefinitions/ethAbi.json
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,12 @@
"abi":
'[{"constant": true, "inputs": [], "name": "name", "outputs": [{"name": "", "type": "string"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "endBlock", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": false, "inputs": [{"name": "spender", "type": "address"}, {"name": "value", "type": "uint256"}], "name": "approve", "outputs": [{"name": "", "type": "bool"}], "payable": false, "stateMutability": "nonpayable", "type": "function"}, {"constant": true, "inputs": [], "name": "totalSupply", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": false, "inputs": [{"name": "from", "type": "address"}, {"name": "to", "type": "address"}, {"name": "value", "type": "uint256"}], "name": "transferFrom", "outputs": [{"name": "", "type": "bool"}], "payable": false, "stateMutability": "nonpayable", "type": "function"}, {"constant": true, "inputs": [], "name": "ethFundAddress", "outputs": [{"name": "", "type": "address"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "secondCapEndingBlock", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "decimals", "outputs": [{"name": "", "type": "uint8"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "isStopped", "outputs": [{"name": "", "type": "bool"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "minCap", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "tokenExchangeRate", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": false, "inputs": [], "name": "claimTokens", "outputs": [], "payable": true, "stateMutability": "payable", "type": "function"}, {"constant": true, "inputs": [], "name": "startBlock", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "baseTokenCapPerAddress", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": false, "inputs": [], "name": "finalize", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function"}, {"constant": false, "inputs": [], "name": "refund", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function"}, {"constant": true, "inputs": [], "name": "blocksInSecondCapPeriod", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [{"name": "owner", "type": "address"}], "name": "balanceOf", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": false, "inputs": [], "name": "restartSale", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function"}, {"constant": false, "inputs": [{"name": "targets", "type": "address[]"}, {"name": "isRegistered", "type": "bool"}], "name": "changeRegistrationStatuses", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function"}, {"constant": true, "inputs": [{"name": "", "type": "address"}], "name": "purchases", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "isFinalized", "outputs": [{"name": "", "type": "bool"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "owner", "outputs": [{"name": "", "type": "address"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "symbol", "outputs": [{"name": "", "type": "string"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": false, "inputs": [{"name": "_newOwner", "type": "address"}], "name": "changeOwner", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function"}, {"constant": false, "inputs": [{"name": "to", "type": "address"}, {"name": "value", "type": "uint256"}], "name": "transfer", "outputs": [{"name": "", "type": "bool"}], "payable": false, "stateMutability": "nonpayable", "type": "function"}, {"constant": true, "inputs": [], "name": "assignedSupply", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [{"name": "", "type": "address"}], "name": "registered", "outputs": [{"name": "", "type": "bool"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "blocksInFirstCapPeriod", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "gmtFundAddress", "outputs": [{"name": "", "type": "address"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "gmtFund", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [{"name": "owner", "type": "address"}, {"name": "spender", "type": "address"}], "name": "allowance", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "baseEthCapPerAddress", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": true, "inputs": [], "name": "firstCapEndingBlock", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": false, "inputs": [], "name": "stopSale", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function"}, {"constant": true, "inputs": [], "name": "tokenUnit", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"constant": false, "inputs": [{"name": "target", "type": "address"}, {"name": "isRegistered", "type": "bool"}], "name": "changeRegistrationStatus", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function"}, {"constant": true, "inputs": [], "name": "gasLimitInWei", "outputs": [{"name": "", "type": "uint256"}], "payable": false, "stateMutability": "view", "type": "function"}, {"inputs": [{"name": "_ethFundAddress", "type": "address"}, {"name": "_gmtFundAddress", "type": "address"}, {"name": "_startBlock", "type": "uint256"}, {"name": "_endBlock", "type": "uint256"}, {"name": "_tokenExchangeRate", "type": "uint256"}], "payable": false, "stateMutability": "nonpayable", "type": "constructor"}, {"payable": true, "stateMutability": "payable", "type": "fallback"}, {"anonymous": false, "inputs": [{"indexed": true, "name": "_to", "type": "address"}, {"indexed": false, "name": "_value", "type": "uint256"}], "name": "RefundSent", "type": "event"}, {"anonymous": false, "inputs": [{"indexed": true, "name": "_to", "type": "address"}, {"indexed": false, "name": "_value", "type": "uint256"}], "name": "ClaimGMT", "type": "event"}, {"anonymous": false, "inputs": [{"indexed": true, "name": "from", "type": "address"}, {"indexed": true, "name": "to", "type": "address"}, {"indexed": false, "name": "value", "type": "uint256"}], "name": "Transfer", "type": "event"}, {"anonymous": false, "inputs": [{"indexed": true, "name": "owner", "type": "address"}, {"indexed": true, "name": "spender", "type": "address"}, {"indexed": false, "name": "value", "type": "uint256"}], "name": "Approval", "type": "event"}]'
},
{
"name": "Havven (HAV)",
"address": "0xC011A72400E58ecD99Ee497CF89E3775d4bd732F",
"abi":
'[{"constant":false,"inputs":[{"name":"_owner","type":"address"}],"name":"nominateNewOwner","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"nominatedOwner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_target","type":"address"}],"name":"setTarget","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"acceptOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"callData","type":"bytes"},{"name":"numTopics","type":"uint256"},{"name":"topic1","type":"bytes32"},{"name":"topic2","type":"bytes32"},{"name":"topic3","type":"bytes32"},{"name":"topic4","type":"bytes32"}],"name":"_emit","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"useDELEGATECALL","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"value","type":"bool"}],"name":"setUseDELEGATECALL","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"target","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_owner","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"payable":true,"stateMutability":"payable","type":"fallback"},{"anonymous":false,"inputs":[{"indexed":false,"name":"newTarget","type":"address"}],"name":"TargetUpdated","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"newOwner","type":"address"}],"name":"OwnerNominated","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"oldOwner","type":"address"},{"indexed":false,"name":"newOwner","type":"address"}],"name":"OwnerChanged","type":"event"}]'
},
{
"name": "IIC - Ibiscoin ERC20 Token Contract",
"address": "0x16662F73dF3e79e54c6c5938b4313f92C524C120",
Expand Down
64 changes: 38 additions & 26 deletions app/scripts/tokens/ethTokens.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,6 @@
"decimal": 8,
"type": "default"
},
{
"address": "0xd73A66B8FB26Be8B0AcD7c52Bd325054Ac7d468b",
"symbol": "WNK",
"decimal": 18,
"type": "default"
},
{
"address": "0x4CEdA7906a5Ed2179785Cd3A40A69ee8bc99C466",
"symbol": "AION",
Expand Down Expand Up @@ -965,6 +959,12 @@
"decimal": 18,
"type": "default"
},
{
"address": "0xf49cdd50ad408d387d611f88a647179c3de3492b",
"symbol": "CRGO",
"decimal": 18,
"type": "default"
},
{
"address": "0xad723Facb5fd4cDA129d706Ac9D0489B025Ed188",
"symbol": "CRMT",
Expand Down Expand Up @@ -1289,18 +1289,18 @@
"decimal": 2,
"type": "default"
},
{
"address": "0x62d4c04644314f35868ba4c65cc27a77681de7a9",
"symbol": "DRVH",
"decimal": 18,
"type": "default"
},
{
"address": "0x2799d90c6d44cb9aa5fbc377177f16c33e056b82",
"symbol": "DRP (Dripcoin)",
"decimal": 0,
"type": "default"
},
{
"address": "0x62d4c04644314f35868ba4c65cc27a77681de7a9",
"symbol": "DRVH",
"decimal": 18,
"type": "default"
},
{
"address": "0x1e09BD8Cadb441632e441Db3e1D79909EE0A2256",
"symbol": "DSC",
Expand Down Expand Up @@ -1367,18 +1367,18 @@
"decimal": 2,
"type": "default"
},
{
"address": "0xAEA1C18A992984831002D0cf90E291FB52d72649",
"symbol": "ECP",
"decimal": 18,
"type": "default"
},
{
"address": "0x17F93475d2A978f527c3f7c44aBf44AdfBa60D5C",
"symbol": "ECO2",
"decimal": 2,
"type": "default"
},
{
"address": "0xAEA1C18A992984831002D0cf90E291FB52d72649",
"symbol": "ECP",
"decimal": 18,
"type": "default"
},
{
"address": "0xfa1de2ee97e4c10c94c91cb2b5062b89fb140b82",
"symbol": "EDC",
Expand Down Expand Up @@ -2340,14 +2340,14 @@
"type": "default"
},
{
"address": "0x21ae23b882a340a22282162086bc98d3e2b73018",
"symbol": "LOOK old",
"address": "0x253c7dd074f4bacb305387f922225a4f737c08bd",
"symbol": "LOOK",
"decimal": 18,
"type": "default"
},
{
"address": "0x253c7dd074f4bacb305387f922225a4f737c08bd",
"symbol": "LOOK",
"address": "0x21ae23b882a340a22282162086bc98d3e2b73018",
"symbol": "LOOK old",
"decimal": 18,
"type": "default"
},
Expand Down Expand Up @@ -3737,6 +3737,12 @@
"decimal": 18,
"type": "default"
},
{
"address": "0xa5db1d6f7a0d5bccc17d0bfd39d7af32d5e5edc6",
"symbol": "TICO",
"decimal": 5,
"type": "default"
},
{
"address": "0x6531f133e6DeeBe7F2dcE5A0441aA7ef330B4e53",
"symbol": "TIME",
Expand Down Expand Up @@ -3870,14 +3876,14 @@
"type": "default"
},
{
"address": "0x82BD526bDB718C6d4DD2291Ed013A5186cAE2DCa",
"symbol": "VDOC",
"address": "0x57C75ECCc8557136D32619a191fBCDc88560d711",
"symbol": "VDG",
"decimal": 18,
"type": "default"
},
{
"address": "0x57C75ECCc8557136D32619a191fBCDc88560d711",
"symbol": "VDG",
"address": "0x82BD526bDB718C6d4DD2291Ed013A5186cAE2DCa",
"symbol": "VDOC",
"decimal": 18,
"type": "default"
},
Expand Down Expand Up @@ -4043,6 +4049,12 @@
"decimal": 18,
"type": "default"
},
{
"address": "0xd73A66B8FB26Be8B0AcD7c52Bd325054Ac7d468b",
"symbol": "WNK",
"decimal": 18,
"type": "default"
},
{
"address": "0x728781E75735dc0962Df3a51d7Ef47E798A7107E",
"symbol": "WOLK",
Expand Down