diff --git a/CHANGELOG.md b/CHANGELOG.md index 559648ecde..9f9fca579d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### v3.36.0 +- Add new tokens from ethlist [#2249](https://github.com/kvhnuke/etherwallet/pull/2249) + ### v3.35.1 - Remove `;` [#2244](https://github.com/kvhnuke/etherwallet/pull/2244) diff --git a/LICENSE.md b/LICENSE.md index 50b1c7b486..c361438d42 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (C) 2015-2018 MyEtherWallet INC +Copyright (C) 2015-2019 MyEtherWallet INC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/app/includes/footer.tpl b/app/includes/footer.tpl index e385ad52a3..5e4d5e8094 100644 --- a/app/includes/footer.tpl +++ b/app/includes/footer.tpl @@ -45,7 +45,7 @@

- © 2018 MyEtherWallet, Inc + © 2019 MyEtherWallet, Inc

diff --git a/app/layouts/contest.html b/app/layouts/contest.html deleted file mode 100644 index 7cfc4418c0..0000000000 --- a/app/layouts/contest.html +++ /dev/null @@ -1,193 +0,0 @@ -@@include( '../includes/header.tpl', { "site": "mew" } ) -
-

MEW 100K Followers Contest Official Rules

-

NO PURCHASE IS NECESSARY TO ENTER OR WIN. A PURCHASE DOES NOT INCREASE THE CHANCES OF WINNING.

-
    -
  1. - Eligibility: This Campaign is open only to those who complete - the contest requirements and who send an email containing the name, email, - telephone, city and country of residence, along with a link to their video - or blog post to contests@myetherwallet.com - and who are 21 years or older as of the date of entry.The Campaign is only open to legal residents of to - all countries, and is void where prohibited by law. Employees of MyEtherWallet - Inc, its affiliates, subsidiaries, advertising and promotion agencies, and suppliers, - (collectively the “Employees”), and immediate family members and/or those - living in the same household of Employees are not eligible to participate - in the Campaign. The Campaign is subject to all applicable federal, state, - and local laws and regulations. Void where prohibited. -
  2. -
  3. - Agreement to Rules: By participating, the Contestant (“You”) agree to be - fully unconditionally bound by these Rules, and You represent and warrant - that You meet the eligibility requirements. In addition, You agree to - accept the decisions of MyEtherWallet, Inc as final and binding as it - relates to the content of this Campaign. -
  4. -
  5. - Campaign Period: Entries will be accepted online starting on April 12 at - 12:01am PDT and ending on May 31, 2018 at 11:59pm. MyEtherWallet Inc reserves - the right to extend this date for whatever reason. -
  6. -
  7. - How to Enter: The Campaign must be entered by submitting an email - containing the name, email, telephone, city and country of residence, - along with a link to their video or blog post to contests@myetherwallet.com . - The entry must fulfill all Campaign requirements, as specified, to be - eligible to win a prize. Entries that are incomplete or do not adhere to - the rules or specifications may be disqualified at the sole discretion of - MyEtherWallet Inc. Optional verbiage to include: You may enter only once. - You must provide the information requested. You may not enter more times - than indicated by using multiple email addresses, identities, or devices - in an attempt to circumvent the rules. If you use fraudulent methods or - otherwise attempt to circumvent the rules, your submission may be removed - from eligibility at the sole discretion of MyEtherWallet Inc. -
  8. -
  9. - Prizes: The Winner(s) of the Campaign (the “Winner”) will receive First, - Second & Third Prize: Macbook Pro, or MS Surface Pro + top 25 prizes - (approx $2600 value); Top 25: Ledger Hardware wallet w/MEW Gear Pack; - Next 25: MEW Premium Gear Pack; Bottom 25: Standard MEW Gear Pack. - Actual/appraised value may differ at time of prize award. The specifics - of the prize shall be solely determined by MyEtherWallet Inc. No cash or - other prize substitution shall be permitted except at MyEtherWallet Inc’s - discretion. The prize is non-transferable. Any and all prize-related - expenses, including without limitation any and all federal, state, and/or - local taxes, shall be the sole responsibility of Winner. No substitution - of prize or transfer/assignment of prize to others or request for the cash - equivalent by Winner is permitted. Acceptance of prize constitutes permission - for MyEtherWallet, Inc to use Winner’s name, likeness, and entry for - purposes of advertising and trade without further compensation, unless prohibited by law. -
  10. -
  11. - Odds: The odds of winning depend on the number of eligible entries received. -
  12. -
  13. - Winner Selection and Notification: Winner will be selected by judges - chosen at the discretion of MyEtherWallet Inc. Winners will be judged - based on merit in the areas of educational content, clarity, entertainment - value, and formal elements. Winner will be notified by email within five - (5) days following selection of Winner. MyEtherWallet, Inc shall have no - liability for Winner’s failure to receive notices due to spam, junk e-mail - or other security settings or for Winner’s provision of incorrect or - otherwise non-functioning contact information. If Winner cannot be - contacted, is ineligible, fails to claim the prize within 5 days from the - time award notification was sent, or fails to timely return a completed - and executed declaration and release as required, the prize may be forfeited - and an alternate Winner selected. Should fewer than 100 entries be received, - entrants will be evaluated on the criteria outlined in the contest announcement - and these Official Rules, and prizes will be limited to only those entrants. - Receipt by Winner of the prize offered in - this Campaign is conditioned upon compliance with any and all federal, state, - and local laws and regulations. ANY VIOLATION OF THESE OFFICIAL RULES BY WINNER - (AT MYETHERWALLET’S SOLE DISCRETION) WILL RESULT IN WINNER’S DISQUALIFICATION AS - WINNER OF THE CAMPAIGN, AND ALL PRIVILEGES AS WINNER WILL BE IMMEDIATELY TERMINATED. -
  14. -
  15. - Rights Granted by You: By entering this content (e.g., photo, video, text, etc.), - You understand and agree that MyEtherWallet, Inc , anyone acting on behalf of - MyEtherWallet, Inc, andMyEtherWallet, Inc’s licensees, successors, and assigns, - shall have the right, where permitted by law, to print, publish, broadcast, - distribute, and use in any media now known or hereafter developed, in perpetuity - and throughout the World, without limitation, your entry, name, portrait, - picture, voice, likeness, image, statements about the Campaign, and biographical - information for news, publicity, information, trade, advertising, public relations, - and promotional purposes. without any further compensation, notice, review, - or consent. By entering this contest, You - represent and warrant that your entry is an original work of authorship, - and does not violate any third party’s proprietary or intellectual property - rights. If your entry infringes upon the intellectual property right of - another, You will be disqualified at the sole discretion of MyEtherWallet, - Inc . If the content of your entry is claimed to constitute infringement of - any proprietary or intellectual proprietary rights of any third party, you - shall, at your sole expense, defend or settle against such claims. You shall - indemnify, defend, and hold harmless MyEtherWallet, Inc from and against any - suit, proceeding, claims, liability, loss, damage, costs or expense, which - MyEtherWallet, Inc may incur, suffer, or be required to pay arising out of - such infringement or suspected infringement of any third party’s right. -
  16. -
  17. - Terms & Conditions: MyEtherWallet, Inc reserves the right, in its sole - discretion, to cancel, terminate, modify or suspend the Campaign should - virus, bug, non-authorized human intervention, fraud, or other cause beyond - MyEtherWallet’s control corrupt or affect the administration, security, - fairness, or proper conduct of the Campaign. In such case, MyEtherWallet, Inc - may select the Winner from all eligible entries received prior to and/or - after (if appropriate) the action taken by MyEtherWallet, Inc.MyEtherWallet, Inc - reserves the right, in its sole discretion, to disqualify any individual who - tampers or attempts to tamper with the entry process or the operation of the - Campaign or website or violates these Terms & Conditions.MyEtherWallet, Inc has - the right, in its sole discretion, to maintain the integrity of the Campaign, to - void votes for any reason, including, but not limited to: multiple entries from - the same user from different IP addresses; multiple entries from the same - computer in excess of that allowed by Campaign rules; or the use of bots, - macros, scripts, or other technical means for entering. Any attempt by an - entrant to deliberately damage any website or undermine the legitimate - operation of the Campaign may be a violation of criminal and civil laws. - Should such attempt be made,MyEtherWallet, Inc reserves the right to seek - damages to the fullest extent permitted by law. -
  18. -
  19. - Limitation of Liability: By entering, You agree to release and hold - harmless MyEtherWallet, Inc and its subsidiaries, affiliates, - advertising and promotion agencies, partners, representatives, - agents, successors, assigns, employees, officers, and directors from any - liability, illness, injury, death, loss, litigation, claim, or damage that - may occur, directly or indirectly, whether caused by negligence or not, - from: (i) such entrant’s participation in the Campaign and/or his/her - acceptance, possession, use, or misuse of any prize or any portion thereof; - (ii) technical failures of any kind, including but not limited to the - malfunction of any computer, cable, network, hardware, or software, or - other mechanical equipment; (iii) the unavailability or inaccessibility - of any transmissions, telephone, or Internet service; (iv) unauthorized - human intervention in any part of the entry process or the Promotion; (v) - electronic or human error in the administration of the Promotion or the - processing of entries. -
  20. -
  21. - Disputes: THIS Campaign IS GOVERNED BY THE LAWS OF the United States of - America AND the State of California, - WITHOUT RESPECT TO CONFLICT OF LAW DOCTRINES. As a condition of participating in this Campaign, participant - agrees that any and all disputes that cannot be resolved between the parties, - and causes of action arising out of or connected with this Campaign, shall - be resolved individually, without resort to any form of class action, - exclusively before a court located in the State of California having - jurisdiction. Further, in any such dispute, under no circumstances shall - participant be permitted to obtain awards for, and hereby waives all rights - to, punitive, incidental, or consequential damages, including reasonable - attorney’s fees, other than participant’s actual out-of-pocket expenses - (i.e. costs associated with entering this Campaign). Participant further - waives all rights to have damages multiplied or increased. -
  22. -
  23. - Privacy Policy: Personal information of entrants will only be used for the - purposes of identifying and contacting the winners, as well as used as - necessary for the awarding of prizes. Personal information will not be - distributed to third parties, except as necessary to fulfill these - objectives. MyEtherWallet, Inc may use this information to contact - entrants concerning other opportunities for content creation. Entrants may - opt out of being contacted for purposes other than of the contest by - sending a request in writing to contests@myetherwallet.com. -
  24. -
  25. - Winners List: To obtain a copy of the Winner’s name or a copy of these - Official Rules, mail your request along with a stamped, self-addressed - envelope to:MyEtherWallet, Inc 724 S. Spring St.,STE 1104, Los Angeles, - CA 90014. Requests must be received no later than June 30, 2018, 5:00pm PDT -
  26. -
  27. - Sponsor: The Sponsor of the Campaign is MyEtherWallet, Inc - 724 S. Spring St.,STE 1104, Los Angeles, CA 90014. -
  28. -
  29. - Social Media:The Campaign hosted by MyEtherWallet, Inc is in no way - sponsored, endorsed, administered by, or associated with Twitter, - Facebook, Medium, or any other social media service employed for the - purposes of promoting or distributing information concerning this contest. -
  30. -
  31. - By submitting an entry, You, the Entrant, have affirmatively reviewed, - accepted, and agreed to all of the Official Rules. -
  32. -
-
-@@include( '../includes/footer.tpl', { "site": "mew" } ) diff --git a/app/scripts/abiDefinitions/ethAbi.json b/app/scripts/abiDefinitions/ethAbi.json index bba045d379..a7e97b4eb9 100644 --- a/app/scripts/abiDefinitions/ethAbi.json +++ b/app/scripts/abiDefinitions/ethAbi.json @@ -469,6 +469,24 @@ "abi": '[{"constant":false,"inputs":[{"name":"newSellPrice","type":"uint256"},{"name":"newBuyPrice","type":"uint256"}],"name":"setPrices","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"}],"name":"approve","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"sellPrice","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"standard","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"target","type":"address"},{"name":"mintedAmount","type":"uint256"}],"name":"mintToken","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"buyPrice","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"buy","outputs":[],"payable":true,"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"frozenAccount","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"},{"name":"_extraData","type":"bytes"}],"name":"approveAndCall","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"amount","type":"uint256"}],"name":"sell","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"target","type":"address"},{"name":"freeze","type":"bool"}],"name":"freezeAccount","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"type":"function"},{"inputs":[{"name":"initialSupply","type":"uint256"},{"name":"tokenName","type":"string"},{"name":"decimalUnits","type":"uint8"},{"name":"tokenSymbol","type":"string"}],"payable":false,"type":"constructor"},{"payable":false,"type":"fallback"},{"anonymous":false,"inputs":[{"indexed":false,"name":"target","type":"address"},{"indexed":false,"name":"frozen","type":"bool"}],"name":"FrozenFunds","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"}]' }, + { + "name": "Origin Identity", + "address": "0x8Ac16c08105DE55A02E2b7462b1EeC6085fA4d86", + "comment": "", + "abi": '[{"constant":false,"inputs":[{"name":"ipfsHash","type":"bytes32"}],"name":"emitIdentityUpdated","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"emitIdentityDeleted","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"account","type":"address"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"IdentityUpdated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"account","type":"address"}],"name":"IdentityDeleted","type":"event"}]' + }, + { + "name": "Origin Token", + "address": "0x8207c1FfC5B6804F6024322CcF34F29c3541Ae26", + "comment": "", + "abi": '[{"constant":true,"inputs":[],"name":"whitelistActive","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"mintingFinished","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"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":false,"inputs":[{"name":"_transactor","type":"address"}],"name":"addAllowedTransactor","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"unpause","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_amount","type":"uint256"}],"name":"mint","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_value","type":"uint256"}],"name":"burn","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_transactor","type":"address"}],"name":"removeAllowedTransactor","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"paused","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_subtractedValue","type":"uint256"}],"name":"decreaseApproval","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","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":"renounceOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"finishMinting","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"},{"name":"_selector","type":"bytes4"},{"name":"_callParams","type":"bytes"}],"name":"approveAndCallWithSender","outputs":[{"name":"","type":"bool"}],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[],"name":"pause","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":"_spender","type":"address"}],"name":"addCallSpenderWhitelist","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"},{"name":"_value","type":"uint256"}],"name":"burn","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":"whitelistExpiration","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"allowedTransactors","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_expiration","type":"uint256"}],"name":"setWhitelistExpiration","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_addedValue","type":"uint256"}],"name":"increaseApproval","outputs":[{"name":"success","type":"bool"}],"payable":false,"stateMutability":"nonpayable","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":false,"inputs":[{"name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"}],"name":"removeCallSpenderWhitelist","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"callSpenderWhitelist","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_initialSupply","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"enabler","type":"address"},{"indexed":false,"name":"spender","type":"address"}],"name":"AddCallSpenderWhitelist","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"disabler","type":"address"},{"indexed":false,"name":"spender","type":"address"}],"name":"RemoveCallSpenderWhitelist","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"expiration","type":"uint256"}],"name":"SetWhitelistExpiration","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"sender","type":"address"}],"name":"AllowedTransactorAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"sender","type":"address"}],"name":"AllowedTransactorRemoved","type":"event"},{"anonymous":false,"inputs":[],"name":"Pause","type":"event"},{"anonymous":false,"inputs":[],"name":"Unpause","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"amount","type":"uint256"}],"name":"Mint","type":"event"},{"anonymous":false,"inputs":[],"name":"MintFinished","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"previousOwner","type":"address"}],"name":"OwnershipRenounced","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"previousOwner","type":"address"},{"indexed":true,"name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"burner","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Burn","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"},{"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"}]' + }, + { + "name": "Origin Marketplace", + "address": "0x819Bb9964B6eBF52361F1ae42CF4831B921510f9", + "comment": "", + "abi": '[{"constant":false,"inputs":[{"name":"listingID","type":"uint256"},{"name":"offerID","type":"uint256"},{"name":"_refund","type":"uint256"},{"name":"_ipfsHash","type":"bytes32"}],"name":"updateRefund","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"ipfsHash","type":"bytes32"}],"name":"addData","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_tokenAddr","type":"address"}],"name":"setTokenAddr","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"},{"name":"","type":"uint256"}],"name":"offers","outputs":[{"name":"value","type":"uint256"},{"name":"commission","type":"uint256"},{"name":"refund","type":"uint256"},{"name":"currency","type":"address"},{"name":"buyer","type":"address"},{"name":"affiliate","type":"address"},{"name":"arbitrator","type":"address"},{"name":"finalizes","type":"uint256"},{"name":"status","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"listingID","type":"uint256"},{"name":"_ipfsHash","type":"bytes32"},{"name":"_finalizes","type":"uint256"},{"name":"_affiliate","type":"address"},{"name":"_commission","type":"uint256"},{"name":"_value","type":"uint256"},{"name":"_currency","type":"address"},{"name":"_arbitrator","type":"address"}],"name":"makeOffer","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"name":"listingID","type":"uint256"},{"name":"target","type":"address"},{"name":"value","type":"uint256"},{"name":"ipfsHash","type":"bytes32"}],"name":"sendDeposit","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"tokenAddr","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"listingID","type":"uint256"},{"name":"offerID","type":"uint256"},{"name":"_ipfsHash","type":"bytes32"}],"name":"dispute","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"renounceOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_affiliate","type":"address"},{"name":"ipfsHash","type":"bytes32"}],"name":"addAffiliate","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"listingID","type":"uint256"},{"name":"offerID","type":"uint256"},{"name":"_ipfsHash","type":"bytes32"},{"name":"_value","type":"uint256"}],"name":"addFunds","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"listingID","type":"uint256"}],"name":"totalOffers","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"allowedAffiliates","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"listingID","type":"uint256"},{"name":"ipfsHash","type":"bytes32"}],"name":"addData","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"listingID","type":"uint256"},{"name":"offerID","type":"uint256"},{"name":"_ipfsHash","type":"bytes32"}],"name":"acceptOffer","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_affiliate","type":"address"},{"name":"ipfsHash","type":"bytes32"}],"name":"removeAffiliate","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"listingID","type":"uint256"},{"name":"_target","type":"address"},{"name":"_ipfsHash","type":"bytes32"}],"name":"withdrawListing","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"listingID","type":"uint256"},{"name":"_ipfsHash","type":"bytes32"},{"name":"_additionalDeposit","type":"uint256"}],"name":"updateListing","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"listingID","type":"uint256"},{"name":"offerID","type":"uint256"},{"name":"_ipfsHash","type":"bytes32"},{"name":"_ruling","type":"uint256"},{"name":"_refund","type":"uint256"}],"name":"executeRuling","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"totalListings","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"listingID","type":"uint256"},{"name":"_ipfsHash","type":"bytes32"},{"name":"_finalizes","type":"uint256"},{"name":"_affiliate","type":"address"},{"name":"_commission","type":"uint256"},{"name":"_value","type":"uint256"},{"name":"_currency","type":"address"},{"name":"_arbitrator","type":"address"},{"name":"_withdrawOfferID","type":"uint256"}],"name":"makeOffer","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"name":"_ipfsHash","type":"bytes32"},{"name":"_deposit","type":"uint256"},{"name":"_depositManager","type":"address"}],"name":"createListing","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_seller","type":"address"},{"name":"listingID","type":"uint256"},{"name":"_ipfsHash","type":"bytes32"},{"name":"_additionalDeposit","type":"uint256"}],"name":"updateListingWithSender","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"listingID","type":"uint256"},{"name":"offerID","type":"uint256"},{"name":"ipfsHash","type":"bytes32"}],"name":"addData","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_seller","type":"address"},{"name":"_ipfsHash","type":"bytes32"},{"name":"_deposit","type":"uint256"},{"name":"_depositManager","type":"address"}],"name":"createListingWithSender","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"listings","outputs":[{"name":"seller","type":"address"},{"name":"deposit","type":"uint256"},{"name":"depositManager","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"listingID","type":"uint256"},{"name":"offerID","type":"uint256"},{"name":"_ipfsHash","type":"bytes32"}],"name":"withdrawOffer","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"listingID","type":"uint256"},{"name":"offerID","type":"uint256"},{"name":"_ipfsHash","type":"bytes32"}],"name":"finalize","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[{"name":"_tokenAddr","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"MarketplaceData","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"AffiliateAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"AffiliateRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":true,"name":"listingID","type":"uint256"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"ListingCreated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":true,"name":"listingID","type":"uint256"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"ListingUpdated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":true,"name":"listingID","type":"uint256"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"ListingWithdrawn","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":true,"name":"listingID","type":"uint256"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"ListingArbitrated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":true,"name":"listingID","type":"uint256"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"ListingData","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":true,"name":"listingID","type":"uint256"},{"indexed":true,"name":"offerID","type":"uint256"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"OfferCreated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":true,"name":"listingID","type":"uint256"},{"indexed":true,"name":"offerID","type":"uint256"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"OfferAccepted","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":true,"name":"listingID","type":"uint256"},{"indexed":true,"name":"offerID","type":"uint256"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"OfferFinalized","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":true,"name":"listingID","type":"uint256"},{"indexed":true,"name":"offerID","type":"uint256"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"OfferWithdrawn","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":true,"name":"listingID","type":"uint256"},{"indexed":true,"name":"offerID","type":"uint256"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"OfferFundsAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":true,"name":"listingID","type":"uint256"},{"indexed":true,"name":"offerID","type":"uint256"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"OfferDisputed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":true,"name":"listingID","type":"uint256"},{"indexed":true,"name":"offerID","type":"uint256"},{"indexed":false,"name":"ipfsHash","type":"bytes32"},{"indexed":false,"name":"ruling","type":"uint256"}],"name":"OfferRuling","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"party","type":"address"},{"indexed":true,"name":"listingID","type":"uint256"},{"indexed":true,"name":"offerID","type":"uint256"},{"indexed":false,"name":"ipfsHash","type":"bytes32"}],"name":"OfferData","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"previousOwner","type":"address"}],"name":"OwnershipRenounced","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"previousOwner","type":"address"},{"indexed":true,"name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"}]' + }, { "name": "openANX Crowdsale", "address": "0x701C244b988a513c945973dEFA05de933b23Fe1D", diff --git a/app/scripts/main.js b/app/scripts/main.js index fdc3e5054a..38e38067a0 100644 --- a/app/scripts/main.js +++ b/app/scripts/main.js @@ -93,6 +93,10 @@ if (IS_CX) { window.SecalotEth = secalotEth; window.MewConnectEth = MewConnectEth; window.MewConnect = MewConnect; + trezorConnect.manifest({ + email: 'dev@myetherwallet.com', + appUrl: 'https://vintage.myetherwallet.com' + }); } var CustomGasMessages = require("./customGas.js"); window.CustomGasMessages = CustomGasMessages; diff --git a/app/scripts/tokens/ethTokens.json b/app/scripts/tokens/ethTokens.json index 82c27f9f41..bb11a75c42 100644 --- a/app/scripts/tokens/ethTokens.json +++ b/app/scripts/tokens/ethTokens.json @@ -479,6 +479,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0xc73f2474001ad1d6aed615af53631148cf98de6b", + "symbol": "BAR", + "decimal": 18, + "type": "default" + }, { "address": "0x2a05d22db079bc40c2f77a1d1ff703a56e631cc1", "symbol": "BAS", @@ -671,6 +677,18 @@ "decimal": 8, "type": "default" }, + { + "address": "0x5c39bc68e58a242a624e4fc96be77a383c52002d", + "symbol": "BKB", + "decimal": 18, + "type": "default" + }, + { + "address": "0xc88Be04c809856B75E3DfE19eB4dCf0a3B15317a", + "symbol": "BKC", + "decimal": 8, + "type": "default" + }, { "address": "0x3cf9e0c385a5abec9fd2a71790aa344c4e8e3570", "symbol": "BKRx", @@ -689,6 +707,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0x1c3bb10de15c31d5dbe48fbb7b87735d1b7d8c32", + "symbol": "BLO", + "decimal": 18, + "type": "default" + }, { "address": "0x107c4504cd79C5d2696Ea0030a8dD4e92601B82e", "symbol": "BLT", @@ -810,13 +834,13 @@ "type": "default" }, { - "address": "0x63f584fa56e60e4d0fe8802b27c7e6e3b33e007f", + "address": "0xe1A178B681BD05964d3e3Ed33AE731577d9d96dD", "symbol": "BOX", "decimal": 18, "type": "default" }, { - "address": "0xe1A178B681BD05964d3e3Ed33AE731577d9d96dD", + "address": "0x63f584fa56e60e4d0fe8802b27c7e6e3b33e007f", "symbol": "BOX", "decimal": 18, "type": "default" @@ -1091,6 +1115,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0x8293bbd92c42608b20af588620a76128a33e4de9", + "symbol": "CATS", + "decimal": 6, + "type": "default" + }, { "address": "0x68e14bb5A45B9681327E16E528084B9d962C1a39", "symbol": "CATs (BitClave)_Old", @@ -2375,6 +2405,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0x9e4c143bfe35f855624b3f84465ab7401a17a120", + "symbol": "EXC", + "decimal": 18, + "type": "default" + }, { "address": "0xc98e0639c6d2ec037a615341c369666b110e80e5", "symbol": "EXMR", @@ -2429,6 +2465,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0x7cf6dc769482abee2ff75795d000f381a8062dec", + "symbol": "FAR", + "decimal": 18, + "type": "default" + }, { "address": "0x23352036e911a22cfc692b5e2e196692658aded9", "symbol": "FDZ", @@ -2525,6 +2567,12 @@ "decimal": 8, "type": "default" }, + { + "address": "0x4946fcea7c692606e8908002e55a582af44ac121", + "symbol": "FOAM", + "decimal": 18, + "type": "default" + }, { "address": "0x2a093BcF0C98Ef744Bb6F69D74f2F85605324290", "symbol": "FOOD", @@ -2627,6 +2675,12 @@ "decimal": 8, "type": "default" }, + { + "address": "0x4a57e687b9126435a9b19e4a802113e266adebde", + "symbol": "FXC", + "decimal": 18, + "type": "default" + }, { "address": "0x1829aa045e21e0d59580024a951db48096e01782", "symbol": "FXT", @@ -3029,6 +3083,12 @@ "decimal": 8, "type": "default" }, + { + "address": "0x9c9fe3bd60b22a9735908b9589011e78f2025c11", + "symbol": "HNST", + "decimal": 18, + "type": "default" + }, { "address": "0xb45d7Bc4cEBcAB98aD09BABDF8C818B2292B672c", "symbol": "HODL", @@ -3474,13 +3534,13 @@ "type": "default" }, { - "address": "0x05c7065d644096a4e4c3fe24af86e36de021074b", + "address": "0x4a37a91eec4c97f9090ce66d21d3b3aadf1ae5ad", "symbol": "LCT", "decimal": 18, "type": "default" }, { - "address": "0x4a37a91eec4c97f9090ce66d21d3b3aadf1ae5ad", + "address": "0x05c7065d644096a4e4c3fe24af86e36de021074b", "symbol": "LCT", "decimal": 18, "type": "default" @@ -3689,6 +3749,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0xc690f7c7fcffa6a82b79fab7508c466fefdfc8c5", + "symbol": "LYM", + "decimal": 18, + "type": "default" + }, { "address": "0x57ad67acf9bf015e4820fbd66ea1a21bed8852ec", "symbol": "LYM", @@ -3731,6 +3797,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0xEfbB3F1058fd8E0C9d7204f532E17d7572AFfc3e", + "symbol": "MBCASH", + "decimal": 18, + "type": "default" + }, { "address": "0x386467f1f3ddbe832448650418311a479eecfc57", "symbol": "MBRS", @@ -3780,13 +3852,13 @@ "type": "default" }, { - "address": "0x01f2acf2914860331c1cb1a9acecda7475e06af8", + "address": "0xf03045a4c8077e38f3b8e2ed33b8aee69edf869f", "symbol": "MESH", "decimal": 18, "type": "default" }, { - "address": "0xf03045a4c8077e38f3b8e2ed33b8aee69edf869f", + "address": "0x01f2acf2914860331c1cb1a9acecda7475e06af8", "symbol": "MESH", "decimal": 18, "type": "default" @@ -3839,6 +3911,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0xD717B75404022fb1C8582ADf1c66B9A553811754", + "symbol": "MILC", + "decimal": 18, + "type": "default" + }, { "address": "0xe23cd160761f63FC3a1cF78Aa034b6cdF97d3E0C", "symbol": "MIT (Mainstreet)", @@ -4007,6 +4085,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0xa52383b665b91dce42dd4b6d1e0fb37d3effe489", + "symbol": "MUSD", + "decimal": 18, + "type": "default" + }, { "address": "0x515669d308f887fd83a471c7764f5d084886d34d", "symbol": "MUXE", @@ -4295,6 +4379,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0x8207c1ffc5b6804f6024322ccf34f29c3541ae26", + "symbol": "OGN", + "decimal": 18, + "type": "default" + }, { "address": "0x6f539a9456a5bcb6334a1a41207c3788f5825207", "symbol": "OHNI", @@ -4355,6 +4445,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0xB31C219959E06f9aFBeB36b388a4BaD13E802725", + "symbol": "ONOT", + "decimal": 18, + "type": "default" + }, { "address": "0x69c4BB240cF05D51eeab6985Bab35527d04a8C64", "symbol": "OPEN", @@ -4481,6 +4577,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0x9fba684d77d2d6a1408c24b60a1f5534e71f5b75", + "symbol": "PATR", + "decimal": 18, + "type": "default" + }, { "address": "0x8e870d67f660d95d5be530380d0ec0bd388289e1", "symbol": "PAX", @@ -4506,13 +4608,13 @@ "type": "default" }, { - "address": "0xe3f4b4a5d91e5cb9435b947f090a319737036312", + "address": "0xfcAC7A7515e9A9d7619fA77A1fa738111f66727e", "symbol": "PCH", "decimal": 18, "type": "default" }, { - "address": "0xfcAC7A7515e9A9d7619fA77A1fa738111f66727e", + "address": "0xe3f4b4a5d91e5cb9435b947f090a319737036312", "symbol": "PCH", "decimal": 18, "type": "default" @@ -4541,6 +4643,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0xbb0ef9e617faddf54b8d16e29046f72b4d3ec77f", + "symbol": "PEP", + "decimal": 18, + "type": "default" + }, { "address": "0x5884969Ec0480556E11d119980136a4C17eDDEd1", "symbol": "PET", @@ -5843,6 +5951,12 @@ "decimal": 0, "type": "default" }, + { + "address": "0x28d7f432d24ba6020d1cbd4f28bedc5a82f24320", + "symbol": "TCNX", + "decimal": 18, + "type": "default" + }, { "address": "0x2a1dbabe65c595B0022e75208C34014139d5d357", "symbol": "TDH", @@ -6107,6 +6221,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0xa838be6e4b760e6061d4732d6b9f11bf578f9a76", + "symbol": "TTV", + "decimal": 18, + "type": "default" + }, { "address": "0x0000000000085d4780B73119b644AE5ecd22b376", "symbol": "TUSD (New)", @@ -6240,8 +6360,8 @@ "type": "default" }, { - "address": "0xfade17a07ba3b480aa1714c3724a52d4c57d410e", - "symbol": "VEGAN", + "address": "0x9a9bB9b4b11BF8eccff84B58a6CCCCD4058A7f0D", + "symbol": "VD", "decimal": 8, "type": "default" }, @@ -6263,6 +6383,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0xfade17a07ba3b480aa1714c3724a52d4c57d410e", + "symbol": "VEGAN", + "decimal": 8, + "type": "default" + }, { "address": "0xD850942eF8811f2A866692A623011bDE52a462C1", "symbol": "VEN", @@ -6359,6 +6485,12 @@ "decimal": 8, "type": "default" }, + { + "address": "0xf722b01910f93b84eda9ca128b9f05821a41eae1", + "symbol": "VRE", + "decimal": 18, + "type": "default" + }, { "address": "0xeDBaF3c5100302dCddA53269322f3730b1F0416d", "symbol": "VRS", @@ -6371,6 +6503,12 @@ "decimal": 6, "type": "default" }, + { + "address": "0xba3a79d758f19efe588247388754b8e4d6edda81", + "symbol": "VSF", + "decimal": 18, + "type": "default" + }, { "address": "0x5c543e7AE0A1104f78406C340E9C64FD9fCE5170", "symbol": "VSL", @@ -6395,6 +6533,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0x9f6513ED2b0DE89218E97DB4A5115ba04Be449f1", + "symbol": "WAK", + "decimal": 18, + "type": "default" + }, { "address": "0x829A4cA1303383F1082B6B1fB937116e4b3b5605", "symbol": "WATT", @@ -6452,7 +6596,7 @@ { "address": "0x3F17Dd476faF0a4855572F0B6ed5115D9bBA22AD", "symbol": "WIB", - "decimal": 18, + "decimal": 9, "type": "default" }, { @@ -6743,6 +6887,12 @@ "decimal": 18, "type": "default" }, + { + "address": "0x1bc7c1de0ac6ef4fdec35c053030d90cf54c7e9a", + "symbol": "YNN", + "decimal": 18, + "type": "default" + }, { "address": "0xcbeaec699431857fdb4d37addbbdc20e132d4903", "symbol": "YOYOW", diff --git a/chrome-extension/contest.html b/chrome-extension/contest.html deleted file mode 100644 index b72189f6d1..0000000000 --- a/chrome-extension/contest.html +++ /dev/null @@ -1,1312 +0,0 @@ - - - - - -MyEtherWallet.com - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

MEW 100K Followers Contest Official Rules

-

NO PURCHASE IS NECESSARY TO ENTER OR WIN. A PURCHASE DOES NOT INCREASE THE CHANCES OF WINNING.

-
    -
  1. - Eligibility: This Campaign is open only to those who complete - the contest requirements and who send an email containing the name, email, - telephone, city and country of residence, along with a link to their video - or blog post to contests@myetherwallet.com - and who are 21 years or older as of the date of entry.The Campaign is only open to legal residents of to - all countries, and is void where prohibited by law. Employees of MyEtherWallet - Inc, its affiliates, subsidiaries, advertising and promotion agencies, and suppliers, - (collectively the “Employees”), and immediate family members and/or those - living in the same household of Employees are not eligible to participate - in the Campaign. The Campaign is subject to all applicable federal, state, - and local laws and regulations. Void where prohibited. -
  2. -
  3. - Agreement to Rules: By participating, the Contestant (“You”) agree to be - fully unconditionally bound by these Rules, and You represent and warrant - that You meet the eligibility requirements. In addition, You agree to - accept the decisions of MyEtherWallet, Inc as final and binding as it - relates to the content of this Campaign. -
  4. -
  5. - Campaign Period: Entries will be accepted online starting on April 12 at - 12:01am PDT and ending on May 31, 2018 at 11:59pm. MyEtherWallet Inc reserves - the right to extend this date for whatever reason. -
  6. -
  7. - How to Enter: The Campaign must be entered by submitting an email - containing the name, email, telephone, city and country of residence, - along with a link to their video or blog post to contests@myetherwallet.com . - The entry must fulfill all Campaign requirements, as specified, to be - eligible to win a prize. Entries that are incomplete or do not adhere to - the rules or specifications may be disqualified at the sole discretion of - MyEtherWallet Inc. Optional verbiage to include: You may enter only once. - You must provide the information requested. You may not enter more times - than indicated by using multiple email addresses, identities, or devices - in an attempt to circumvent the rules. If you use fraudulent methods or - otherwise attempt to circumvent the rules, your submission may be removed - from eligibility at the sole discretion of MyEtherWallet Inc. -
  8. -
  9. - Prizes: The Winner(s) of the Campaign (the “Winner”) will receive First, - Second & Third Prize: Macbook Pro, or MS Surface Pro + top 25 prizes - (approx $2600 value); Top 25: Ledger Hardware wallet w/MEW Gear Pack; - Next 25: MEW Premium Gear Pack; Bottom 25: Standard MEW Gear Pack. - Actual/appraised value may differ at time of prize award. The specifics - of the prize shall be solely determined by MyEtherWallet Inc. No cash or - other prize substitution shall be permitted except at MyEtherWallet Inc’s - discretion. The prize is non-transferable. Any and all prize-related - expenses, including without limitation any and all federal, state, and/or - local taxes, shall be the sole responsibility of Winner. No substitution - of prize or transfer/assignment of prize to others or request for the cash - equivalent by Winner is permitted. Acceptance of prize constitutes permission - for MyEtherWallet, Inc to use Winner’s name, likeness, and entry for - purposes of advertising and trade without further compensation, unless prohibited by law. -
  10. -
  11. - Odds: The odds of winning depend on the number of eligible entries received. -
  12. -
  13. - Winner Selection and Notification: Winner will be selected by judges - chosen at the discretion of MyEtherWallet Inc. Winners will be judged - based on merit in the areas of educational content, clarity, entertainment - value, and formal elements. Winner will be notified by email within five - (5) days following selection of Winner. MyEtherWallet, Inc shall have no - liability for Winner’s failure to receive notices due to spam, junk e-mail - or other security settings or for Winner’s provision of incorrect or - otherwise non-functioning contact information. If Winner cannot be - contacted, is ineligible, fails to claim the prize within 5 days from the - time award notification was sent, or fails to timely return a completed - and executed declaration and release as required, the prize may be forfeited - and an alternate Winner selected. Should fewer than 100 entries be received, - entrants will be evaluated on the criteria outlined in the contest announcement - and these Official Rules, and prizes will be limited to only those entrants. - Receipt by Winner of the prize offered in - this Campaign is conditioned upon compliance with any and all federal, state, - and local laws and regulations. ANY VIOLATION OF THESE OFFICIAL RULES BY WINNER - (AT MYETHERWALLET’S SOLE DISCRETION) WILL RESULT IN WINNER’S DISQUALIFICATION AS - WINNER OF THE CAMPAIGN, AND ALL PRIVILEGES AS WINNER WILL BE IMMEDIATELY TERMINATED. -
  14. -
  15. - Rights Granted by You: By entering this content (e.g., photo, video, text, etc.), - You understand and agree that MyEtherWallet, Inc , anyone acting on behalf of - MyEtherWallet, Inc, andMyEtherWallet, Inc’s licensees, successors, and assigns, - shall have the right, where permitted by law, to print, publish, broadcast, - distribute, and use in any media now known or hereafter developed, in perpetuity - and throughout the World, without limitation, your entry, name, portrait, - picture, voice, likeness, image, statements about the Campaign, and biographical - information for news, publicity, information, trade, advertising, public relations, - and promotional purposes. without any further compensation, notice, review, - or consent. By entering this contest, You - represent and warrant that your entry is an original work of authorship, - and does not violate any third party’s proprietary or intellectual property - rights. If your entry infringes upon the intellectual property right of - another, You will be disqualified at the sole discretion of MyEtherWallet, - Inc . If the content of your entry is claimed to constitute infringement of - any proprietary or intellectual proprietary rights of any third party, you - shall, at your sole expense, defend or settle against such claims. You shall - indemnify, defend, and hold harmless MyEtherWallet, Inc from and against any - suit, proceeding, claims, liability, loss, damage, costs or expense, which - MyEtherWallet, Inc may incur, suffer, or be required to pay arising out of - such infringement or suspected infringement of any third party’s right. -
  16. -
  17. - Terms & Conditions: MyEtherWallet, Inc reserves the right, in its sole - discretion, to cancel, terminate, modify or suspend the Campaign should - virus, bug, non-authorized human intervention, fraud, or other cause beyond - MyEtherWallet’s control corrupt or affect the administration, security, - fairness, or proper conduct of the Campaign. In such case, MyEtherWallet, Inc - may select the Winner from all eligible entries received prior to and/or - after (if appropriate) the action taken by MyEtherWallet, Inc.MyEtherWallet, Inc - reserves the right, in its sole discretion, to disqualify any individual who - tampers or attempts to tamper with the entry process or the operation of the - Campaign or website or violates these Terms & Conditions.MyEtherWallet, Inc has - the right, in its sole discretion, to maintain the integrity of the Campaign, to - void votes for any reason, including, but not limited to: multiple entries from - the same user from different IP addresses; multiple entries from the same - computer in excess of that allowed by Campaign rules; or the use of bots, - macros, scripts, or other technical means for entering. Any attempt by an - entrant to deliberately damage any website or undermine the legitimate - operation of the Campaign may be a violation of criminal and civil laws. - Should such attempt be made,MyEtherWallet, Inc reserves the right to seek - damages to the fullest extent permitted by law. -
  18. -
  19. - Limitation of Liability: By entering, You agree to release and hold - harmless MyEtherWallet, Inc and its subsidiaries, affiliates, - advertising and promotion agencies, partners, representatives, - agents, successors, assigns, employees, officers, and directors from any - liability, illness, injury, death, loss, litigation, claim, or damage that - may occur, directly or indirectly, whether caused by negligence or not, - from: (i) such entrant’s participation in the Campaign and/or his/her - acceptance, possession, use, or misuse of any prize or any portion thereof; - (ii) technical failures of any kind, including but not limited to the - malfunction of any computer, cable, network, hardware, or software, or - other mechanical equipment; (iii) the unavailability or inaccessibility - of any transmissions, telephone, or Internet service; (iv) unauthorized - human intervention in any part of the entry process or the Promotion; (v) - electronic or human error in the administration of the Promotion or the - processing of entries. -
  20. -
  21. - Disputes: THIS Campaign IS GOVERNED BY THE LAWS OF the United States of - America AND the State of California, - WITHOUT RESPECT TO CONFLICT OF LAW DOCTRINES. As a condition of participating in this Campaign, participant - agrees that any and all disputes that cannot be resolved between the parties, - and causes of action arising out of or connected with this Campaign, shall - be resolved individually, without resort to any form of class action, - exclusively before a court located in the State of California having - jurisdiction. Further, in any such dispute, under no circumstances shall - participant be permitted to obtain awards for, and hereby waives all rights - to, punitive, incidental, or consequential damages, including reasonable - attorney’s fees, other than participant’s actual out-of-pocket expenses - (i.e. costs associated with entering this Campaign). Participant further - waives all rights to have damages multiplied or increased. -
  22. -
  23. - Privacy Policy: Personal information of entrants will only be used for the - purposes of identifying and contacting the winners, as well as used as - necessary for the awarding of prizes. Personal information will not be - distributed to third parties, except as necessary to fulfill these - objectives. MyEtherWallet, Inc may use this information to contact - entrants concerning other opportunities for content creation. Entrants may - opt out of being contacted for purposes other than of the contest by - sending a request in writing to contests@myetherwallet.com. -
  24. -
  25. - Winners List: To obtain a copy of the Winner’s name or a copy of these - Official Rules, mail your request along with a stamped, self-addressed - envelope to:MyEtherWallet, Inc 724 S. Spring St.,STE 1104, Los Angeles, - CA 90014. Requests must be received no later than June 30, 2018, 5:00pm PDT -
  26. -
  27. - Sponsor: The Sponsor of the Campaign is MyEtherWallet, Inc - 724 S. Spring St.,STE 1104, Los Angeles, CA 90014. -
  28. -
  29. - Social Media:The Campaign hosted by MyEtherWallet, Inc is in no way - sponsored, endorsed, administered by, or associated with Twitter, - Facebook, Medium, or any other social media service employed for the - purposes of promoting or distributing information concerning this contest. -
  30. -
  31. - By submitting an entry, You, the Entrant, have affirmatively reviewed, - accepted, and agreed to all of the Official Rules. -
  32. -
-
- - - - - - - - - - - - - - - - - diff --git a/chrome-extension/cx-wallet.html b/chrome-extension/cx-wallet.html index 8b388e7cce..fe61e91190 100644 --- a/chrome-extension/cx-wallet.html +++ b/chrome-extension/cx-wallet.html @@ -8143,7 +8143,7 @@

- © 2018 MyEtherWallet, Inc + © 2019 MyEtherWallet, Inc

diff --git a/chrome-extension/embedded.html b/chrome-extension/embedded.html new file mode 100644 index 0000000000..d4d9e222a7 --- /dev/null +++ b/chrome-extension/embedded.html @@ -0,0 +1,579 @@ + + + + + MyEtherWallet.com + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + +
+ + + +
+ +
+ +
+
+
+

+ Create New Wallet +

+

+ Enter password +

+
+ + + +
+ + Generate Wallet + + + +

+ +
+
+ +
+ +

+ Already have a wallet somewhere? +

+ +
    +
  • +

    + + Ledger / TREZOR / BitBox / Secalot + : + + Use your + + + hardware wallet + . + + Your device * is * your wallet. + +

    +
  • +
+ +
    +
  • +

    + + MetaMask + + + Connect via your + + + MetaMask Extension + . + + So easy! Keys stay in MetaMask, not on a phishing site! Try it today. + +

    +
  • +
+ + + + + +
+ +
+ + +
+ +
+
+

+ Save your Keystore File (UTC / JSON) +

+ + + + DOWNLOAD + + + Keystore File (UTC / JSON) + + + +
+

+ **Do not lose it!** It cannot be recovered if you lose it. +

+

+ **Do not share it!** Your funds will be stolen if you use this file on a malicious/phishing site. +

+

+ **Make a backup!** Secure it like the millions of dollars it may one day be worth. +

+
+ +

+ + + I understand. Continue. + + +

+ +
+ +
+

+ Not Downloading a File? +

+
    +
  • + Try using Google Chrome +
  • +
  • + Right click & save file as. Filename: +
  • + +
+ +

+ Don't open this file on your computer +

+
    +
  • + Use it to unlock your wallet via MyEtherWallet (or Mist, Geth, Parity & other wallet clients.) +
  • +
+ +

Guides & FAQ

+ + +
+ +
+ + +
+ +
+ +
+ +

Save your Private Key

+ +
+ + + PRINT + + +
+

+ **Do not lose it!** It cannot be recovered if you lose it. +

+

+ **Do not share it!** Your funds will be stolen if you use this file on a malicious/phishing site. +

+

+ **Make a backup!** Secure it like the millions of dollars it may one day be worth. +

+
+ +
+ + + Save your Address → + + +
+ +
+

+ Guides & FAQ +

+ + +

+ Why Should I? +

+
    +
  • + To have a secondary backup. +
  • +
  • + In case you ever forget your password. +
  • +
  • + Cold Storage +
  • +
+ +

+ +
+ +
+ +
+
+ +
+ +- +

Unlock your wallet to see your address

+

+
+ +
+ + +
+
+ +
+ +
+ +
+ +
+ + +
+ +
+
+
+
+ +
+ + + DOWNLOAD + +
+ +
+ +
+ + +
+
+ + +
+ + + Print Paper Wallet + +
+
+ + +
+ +
+ +
+ Your Address: +
+
+ +
+ +
+ +
+ + Private Key (unencrypted) + +
+ +
+
+
+
+ + +
+
+ +
+ +
+ + +
+ +
+ +
+ +
+ +
+
+ + +
+ + + +
+ +
+ + + +
+ + +