Skip to content
Permalink
Browse files

Merge remote-tracking branch 'upstream/mercury' into mercury

# Conflicts:
#	chrome-extension/js/etherwallet-master.js
#	dist/js/etherwallet-master.js
  • Loading branch information...
SteveMieskoski committed Nov 29, 2018
2 parents 77d449e + 719be58 commit e78ec3b6bb76e37e5a909ef41f3bd7d9647bea41
@@ -1,3 +1,26 @@
### New

- Add PIT, SKE tokens, add HUM contract [#2165](https://github.com/kvhnuke/etherwallet/pull/2165)
- Add ZIX token [#2163](https://github.com/kvhnuke/etherwallet/pull/2163)
- Add CRO contract [#2160](https://github.com/kvhnuke/etherwallet/pull/2160)
- ADD DEX token [#2161](https://github.com/kvhnuke/etherwallet/pull/2161)
- ADD SAC token [#2159](https://github.com/kvhnuke/etherwallet/pull/2159)
- Add ABBC, GROO, FGP, and LIBER tokens [#2162](https://github.com/kvhnuke/etherwallet/pull/2162)
- Add NCC, LG, LML, and GNY tokens [#2158](https://github.com/kvhnuke/etherwallet/pull/2158)
- PTON token [#2157](https://github.com/kvhnuke/etherwallet/pull/2157)
- ABBC contract [#2156](https://github.com/kvhnuke/etherwallet/pull/2156)
- ABBC custom gas [#2155](https://github.com/kvhnuke/etherwallet/pull/2155)
- LML contract [#2152](https://github.com/kvhnuke/etherwallet/pull/2152)
- GNY contract [#2151](https://github.com/kvhnuke/etherwallet/pull/2151)

### Release v3.26.0

### New

- Update changelog, update darklist, update coinvest token, update u2f package [#2149](https://github.com/kvhnuke/etherwallet/pull/2149)
- Add Trezor Hardware Wallet Support for MIX Blockchain (MIX) [#2146](https://github.com/kvhnuke/etherwallet/pull/2146)
- Add Callisto Cold Staking Contract ABI & Update Explorer [#2144](https://github.com/kvhnuke/etherwallet/pull/2144)

### Release v3.25.0

### New
@@ -281,7 +304,7 @@
- Add CLB token [#1912](https://github.com/kvhnuke/etherwallet/pull/1912)
- Update EOS classic style [#1911](https://github.com/kvhnuke/etherwallet/pull/1911)
- Add EOS classic node [#1903](https://github.com/kvhnuke/etherwallet/pull/1903)
- Add $FFC token [#1910](https://github.com/kvhnuke/etherwallet/pull/1910)
- Add \$FFC token [#1910](https://github.com/kvhnuke/etherwallet/pull/1910)
- Add OAK and RAO tokens [#1909](https://github.com/kvhnuke/etherwallet/pull/1909)
- BBK abi [#1901](https://github.com/kvhnuke/etherwallet/pull/1901)
- OAK custom Gas [#1907](https://github.com/kvhnuke/etherwallet/pull/1907)
@@ -100,18 +100,18 @@
@@if (site === 'mew' ) {
<a class="brand" href="/" aria-label="Go to homepage">
<img src="images/logo-myetherwallet.svg" height="64px" width="245px" alt="MyEtherWallet" />
<p class="small visible-xs">3.25.0</p>
<p class="small visible-xs">3.26.0</p>
</a>
}
@@if (site === 'cx' ) {
<a class="brand" href="/cx-wallet.html" aria-label="Go to homepage">
<img src="images/logo-myetherwalletcx.svg" height="64px" width="245px" alt="MyEtherWallet" />
<p class="small visible-xs">3.25.0</p>
<p class="small visible-xs">3.26.0</p>
</a>
}
<div class="tagline">
<span class="hidden-xs">3.25.0</span>
<span class="hidden-xs">3.26.0</span>
<span class="dropdown dropdown-lang" ng-cloak>
<a tabindex="0" aria-haspopup="true" aria-expanded="false" aria-label="change language. current language {{curLang}}" class="dropdown-toggle" ng-click="dropdown = !dropdown">{{curLang}}<i class="caret"></i></a>
@@ -1,6 +1,6 @@
{
"name": "MyEtherWallet",
"version": "3.25.0",
"version": "3.26.0",
"manifest_version": 2,
"description": "MyEtherWallet Chrome Extension",
"homepage_url": "https://www.myetherwallet.com/",
@@ -1,6 +1,6 @@
{
"name": "MyEtherWallet",
"version": "3.25.0",
"version": "3.26.0",
"description": "An NPM dist of MyEtherWallet. For easier downloading & updating via CLI.",
"author": "MyEtherWallet",
"license": "ISC",
@@ -1 +1,17 @@
[]
[
{
"name":"Select a contract...",
"address":"",
"abi":""
},
{
"name":"Callisto Cold Staking",
"address":"0xd813419749b3c2cdc94a2f9cfcf154113264a9d6",
"abi":'[{"constant":false,"inputs":[],"name":"start_staking","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[],"name":"claim","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"staker","outputs":[{"name":"amount","type":"uint256"},{"name":"time","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"_addr","type":"address"}],"name":"stake_reward","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"withdraw_stake","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"payable":true,"stateMutability":"payable","type":"fallback"},{"anonymous":false,"inputs":[{"indexed":false,"name":"addr","type":"address"},{"indexed":false,"name":"value","type":"uint256"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"time","type":"uint256"}],"name":"StartStaking","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"staker","type":"address"},{"indexed":false,"name":"amount","type":"uint256"}],"name":"WithdrawStake","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"staker","type":"address"},{"indexed":false,"name":"reward","type":"uint256"}],"name":"Claim","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_address","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"DonationDeposited","type":"event"}]'
},
{
"name":"Officiality Checker",
"address":"0xf6f29e5ba51171c4ef4997bd0208c7e9bc5d5eda",
"abi":'[{"constant":false,"inputs":[{"name":"_name","type":"string"}],"name":"remove_entry","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"}],"name":"fire","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":"_name","type":"string"},{"name":"_link","type":"string"},{"name":"_metadata","type":"string"}],"name":"add_entry","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"}],"name":"hire","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_name","type":"string"}],"name":"get_entry","outputs":[{"name":"","type":"string"},{"name":"","type":"string"},{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"_link","type":"string"}],"name":"is_official","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"}],"name":"transfer_ownership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_name","type":"string"}],"name":"Registered","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_name","type":"string"}],"name":"Removed","type":"event"}]'
}
]
Oops, something went wrong.

0 comments on commit e78ec3b

Please sign in to comment.
You can’t perform that action at this time.