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

Commit

Permalink
adds musicoin supports with mcdnode.trustfarm.io
Browse files Browse the repository at this point in the history
  • Loading branch information
trustfarm-dev committed Aug 2, 2017
1 parent 8820c29 commit 0489500
Show file tree
Hide file tree
Showing 19 changed files with 128,189 additions and 103,320 deletions.
1 change: 1 addition & 0 deletions app/scripts/abiDefinitions/musicAbi.json
@@ -0,0 +1 @@
[]
6 changes: 6 additions & 0 deletions app/scripts/controllers/CX/addWalletCtrl.js
Expand Up @@ -42,6 +42,9 @@ var addWalletCtrl = function($scope, $sce) {
case nodes.nodeTypes.ETC:
$scope.HDWallet.dPath = $scope.HDWallet.ledgerClassicPath;
break;
case nodes.nodeTypes.MUS:
$scope.HDWallet.dPath = $scope.HDWallet.ledgerMusicPath;
break;
default:
$scope.HDWallet.dPath = $scope.HDWallet.ledgerPath;
}
Expand All @@ -53,6 +56,9 @@ var addWalletCtrl = function($scope, $sce) {
case nodes.nodeTypes.ETC:
$scope.HDWallet.dPath = $scope.HDWallet.trezorClassicPath;
break;
case nodes.nodeTypes.MUS:
$scope.HDWallet.dPath = $scope.HDWallet.trezorMusicPath;
break;
case nodes.nodeTypes.Ropsten:
$scope.HDWallet.dPath = $scope.HDWallet.trezorTestnetPath;
break;
Expand Down
6 changes: 6 additions & 0 deletions app/scripts/controllers/decryptWalletCtrl.js
Expand Up @@ -38,6 +38,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
case nodes.nodeTypes.ETC:
$scope.HDWallet.dPath = $scope.HDWallet.ledgerClassicPath;
break;
case nodes.nodeTypes.MUS:
$scope.HDWallet.dPath = $scope.HDWallet.ledgerMusicPath;
break;
default:
$scope.HDWallet.dPath = $scope.HDWallet.ledgerPath;
}
Expand All @@ -49,6 +52,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) {
case nodes.nodeTypes.ETC:
$scope.HDWallet.dPath = $scope.HDWallet.trezorClassicPath;
break;
case nodes.nodeTypes.MUS:
$scope.HDWallet.dPath = $scope.HDWallet.trezorMusicPath;
break;
case nodes.nodeTypes.Ropsten:
$scope.HDWallet.dPath = $scope.HDWallet.trezorTestnetPath;
break;
Expand Down
13 changes: 13 additions & 0 deletions app/scripts/nodes.js
Expand Up @@ -5,6 +5,7 @@ nodes.infuraNode = require('./nodeHelpers/infura');
nodes.nodeTypes = {
ETH: "ETH",
ETC: "ETC",
MUS: "MUSIC",
Ropsten: "ROPSTEN ETH",
Kovan: "KOVAN ETH",
Rinkeby: "RINKEBY ETH",
Expand Down Expand Up @@ -74,6 +75,18 @@ nodes.nodeList = {
'service': 'Epool.io',
'lib': new nodes.customNode('https://mewapi.epool.io', '')
},
'music_tfarm': {
'name': 'MUSIC',
'blockExplorerTX': 'https://orbiter.musicoin.org/tx/[[txHash]]',
'blockExplorerAddr': 'https://orbiter.musicoin.org/addr/[[address]]',
'type': nodes.nodeTypes.MUS,
'eip155': true,
'chainId': 7762959,
'tokenList': require('./tokens/musicTokens.json'),
'abiList': require('./abiDefinitions/musicAbi.json'),
'service': 'trustfarm.io',
'lib': new nodes.customNode('https://mcdnode.trustfarm.io/api', '')
},
'rop_mew': {
'name': 'Ropsten',
'type': nodes.nodeTypes.Ropsten,
Expand Down
1 change: 1 addition & 0 deletions app/scripts/tokens/musicTokens.json
@@ -0,0 +1 @@
[]
527 changes: 527 additions & 0 deletions chrome-extension/embedded.html

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions chrome-extension/images/fav/manifest.json
@@ -0,0 +1,18 @@
{
"name": "MyEtherWallet",
"icons": [
{
"src": "/images/fav/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/images/fav/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#1d6986",
"background_color": "#1d6986",
"display": "standalone"
}
3,527 changes: 3,527 additions & 0 deletions chrome-extension/index.html

Large diffs are not rendered by default.

111,763 changes: 60,104 additions & 51,659 deletions chrome-extension/js/etherwallet-master.js

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions chrome-extension/package.json
@@ -0,0 +1,13 @@
{
"name": "MyEtherWallet",
"version": "3.10.0",
"description": "An NPM dist of MyEtherWallet. For easier downloading & updating via CLI.",
"author": "MyEtherWallet",
"license": "ISC",
"devDependencies": {
"open": "0.0.5"
},
"bin": {
"mew": "bin/startMEW.js"
}
}
238 changes: 238 additions & 0 deletions chrome-extension/signmsg.html
@@ -0,0 +1,238 @@
<!DOCTYPE html>
<html lang="en" ng-app="mewApp">
<head>
<meta charset="utf-8">
<title>MyEtherWallet.com</title>
<link rel="canonical" href="https://www.myetherwallet.com" />
<meta name="description" content="MyEtherWallet.com is a free, open-source, client-side interface for generating Ethereum wallets &amp; more. Interact with the Ethereum blockchain easily &amp; securely. Double-check the URL ( .com ) before unlocking your wallet.">
<meta name="author" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="css/etherwallet-master.min.css">
<script type="text/javascript" src="js/etherwallet-static.min.js"></script>
<script type="text/javascript" src="js/etherwallet-master.js"></script>
<link rel="apple-touch-icon" sizes="60x60" href="images/fav/apple-touch-icon-60x60.png">
<link rel="apple-touch-icon" sizes="76x76" href="images/fav/apple-touch-icon-76x76.png">
<link rel="apple-touch-icon" sizes="120x120" href="images/fav/apple-touch-icon-120x120.png">
<link rel="apple-touch-icon" sizes="152x152" href="images/fav/apple-touch-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="images/fav/apple-touch-icon-180x180.png">
<link rel="icon" type="image/png" href="images/fav/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="images/fav/favicon-194x194.png" sizes="194x194">
<link rel="icon" type="image/png" href="images/fav/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="images/fav/android-chrome-192x192.png" sizes="192x192">
<link rel="icon" type="image/png" href="images/fav/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="images/fav/manifest.json">
<link rel="shortcut icon" href="images/favicon.ico">
<meta name="msapplication-TileColor" content="#2e4868">
<meta name="msapplication-TileImage" content="images/fav/mstile-144x144.png">
<meta name="msapplication-config" content="images/fav/browserconfig.xml">
<meta name="theme-color" content="#2e4868">
</head>

<body>

<header class="bg-gradient text-white">
<section class="container text-center">
<a href="https://www.myetherwallet.com/"><img src="images/logo-myetherwallet.svg" height="50px" width="auto" alt="Ether Wallet" class="embedded-logo" /></a>
</section>
</header>

<section ng-controller="tabsCtrl">
<section class="container" style="min-height: 50%" ng-controller='signMsgCtrl'>
<!-- tab panes -->
<div class="tab-content">
<!-- Sign Message Panel -->
<h2>
<a translate="NAV_SignMsg" ng-class="{ 'isActive': visibility=='signView'}" ng-click="setVisibility('signView')"> Sign Message </a>
or
<a translate="MSG_verify" ng-class="{ 'isActive': visibility=='verifyView'}" ng-click="setVisibility('verifyView')"> Verify Message </a>
</h2>

<article class="col-xs-12 clearfix" ng-switch on="visibility">

<!-- Sign Message Stuff -->
<section ng-switch-when="signView">

<!-- Message -->
<div class="account-help-icon">
<img src="images/icon-help.svg" class="help-icon" />
<ul class="account-help-text">
<li translate="MSG_info2">Include your nickname and where you use the nickname so someone else cannot use it.</li>
<li translate="MSG_info3">Include a specific reason for the message so it cannot be reused for a different purpose.</li>
</ul>
<h5 translate="MSG_message"> Message </h5>
</div>


<textarea class="form-control" ng-model="signMsg.message" placeholder="This is user kvhnuke on reddit. The purpose of this message is to prove that 0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8 is my address." rows="5"></textarea>

<!-- Date -->
<div class="account-help-icon">
<img src="images/icon-help.svg" class="help-icon" />
<p class="account-help-text" translate="MSG_info1">Include the current date so the signature cannot be reused on a different date.</p>
<h5 translate="MSG_date"> Date </h5>
</div>
<input class="form-control" ng-model="signMsg.dateTime" type="text" placeholder="1 JAN 2016 14:15" />

<!-- Sign Message Button -->
<a class="btn btn-info btn-block" ng-click="generateSignedMsg()" translate="NAV_SignMsg" ng-show="wallet!=null"> Sign Message </a>


<!-- Signed Message -->
<div ng-show="signMsg.signedMsg">
<h5 translate="MSG_signature"> Signature </h5>
<textarea class="form-control" rows="4" readonly title="Signature">{{signMsg.signedMsg }}</textarea>
</div>
</section>
<!-- / Sign Message Stuff -->



<!-- Verify Message Stuff -->
<section ng-switch-when="verifyView">
<!-- Signature -->
<h5 translate="MSG_signature"> Signature </h5>
<textarea class="form-control" ng-model="verifyMsg.signedMsg" rows="6" placeholder='{ "address":"0xA7DeFf12461661212734dB35AdE9aE7d987D648c","msg":"This message was signed by kvhnuke | 28 NOV 2016 1:38AM","sig":"0x2190fdf0a011863fed22050372088d08404eb7cae020b73f24cfeca967773b3867f53f1ec96baffbdc6ec9dd3ca7c2ba4eed19a500f65cb3c343e24091b0c4f21b"}'></textarea>

<!-- Verify Signature Message Button -->
<a class="btn btn-info btn-block" ng-click="verifySignedMessage()" translate="MSG_verify" ng-show="verifyMsg.signedMsg!=''"> Verify Message </a>



</section>
<!-- / Verify Message Stuff -->

</article>
<!-- / Sign Message Panel -->

<div ng-show="visibility=='signView' && wallet==null"><wallet-decrypt-drtv></wallet-decrypt-drtv></div>
</div>
<!-- /tab panes -->

<div data-ng-repeat="alert in notifier.alerts">
<div class="alert popup alert-{{alert.type}} animated-show-hide"
style="bottom: {{85*$index}}px; z-index: {{999+$index}};">
<div class="container">
<div class='alert-message' ng-bind-html="alert.message"></div>
</div>
<i class="icon-close" ng-click="alert.close()"></i>
</div>
</div>


</section>
</section>
<footer>
<div class="container">
<p>
<a href="https://www.myetherwallet.com" target="_blank" rel="noopener">MyEtherWallet.com</a>:

Free, open-source, client-side interface for generating Ethereum wallets &amp; more. Interact with the Ethereum blockchain easily &amp; securely. Double-check the URL ( .com ) before unlocking your wallet.

Created by
<a aria-label="kvhnuke's github" href="https://github.com/kvhnuke" target="_blank" rel="noopener">kvhnuke</a>
&amp;
<a aria-label="tayvano's github" href="https://github.com/tayvano" target="_blank" rel="noopener">tayvano</a>
&middot;
<a href="https://www.MyEtherWallet.com" target="_blank" rel="noopener" aria-label="my ether wallet.com">
MyEtherWallet.com
</a>
&middot;
<a href="https://github.com/kvhnuke/etherwallet" target="_blank" rel="noopener" aria-label="my ether wallet github">
Github
</a>
&middot;
<a href="https://myetherwallet.herokuapp.com/" target="_blank" rel="noopener" aria-label="join our slack">
Slack
</a>
&middot;
<a href="https://twitter.com/myetherwallet" target="_blank" rel="noopener" aria-label="twitter">
Twitter
</a>
&middot;
<a href="https://www.facebook.com/MyEtherWallet/" target="_blank" rel="noopener" aria-label="facebook">
Facebook
</a>
&middot;
<a href="mailto:support@myetherwallet.com" target="_blank" rel="noopener" aria-label="email support at myetherwallet.com">
Email
</a>
&middot;
<a role="link" tabindex="0" data-toggle="modal" data-target="#disclaimerModal" translate="FOOTER_4"> Disclaimer </a>

&middot;

&copy; 2017 MyEtherWallet, LLC </p>

</div>
</footer>

<script type='application/ld+json'>
{
"@context":"http://schema.org",
"@type":"Organization",
"@id":"#organization",
"url":"https://www.myetherwallet.com/",
"name":"MyEtherWallet",
"logo":"https://myetherwallet.com/images/myetherwallet-logo-banner.png",
"description": "MyEtherWallet.com is a free, open-source, client-side interface for generating Ethereum wallets &amp; more. Interact with the Ethereum blockchain easily &amp; securely. Double-check the URL ( .com ) before unlocking your wallet.",
"sameAs":[
"https://www.myetherwallet.com/",
"https://chrome.google.com/webstore/detail/myetherwallet-cx/nlbmnnijcnlegkjjpcfjclmcfggfefdm",
"https://www.facebook.com/MyEtherWallet/",
"https://twitter.com/myetherwallet",
"https://medium.com/@myetherwallet_96408",
"https://myetherwallet.groovehq.com/help_center",
"https://github.com/kvhnuke/etherwallet",
"https://github.com/MyEtherWallet",
"https://kvhnuke.github.io/etherwallet/",
"https://github.com/kvhnuke/etherwallet/releases/latest",
"https://github.com/409H/EtherAddressLookup",
"https://myetherwallet.slack.com/",
"https://myetherwallet.herokuapp.com/",
"https://www.reddit.com/r/MyEtherWallet/",
"https://www.reddit.com/user/insomniasexx/",
"https://www.reddit.com/user/kvhnuke/",
"https://www.reddit.com/user/myetherwallet"
]
}
</script>

<article class="modal fade" id="disclaimerModal" tabindex="-1">
<section class="modal-dialog">
<section class="modal-content">

<div class="modal-body">
<button type="button" class="close" data-dismiss="modal">&times;</button>

<h2 class="modal-title text-info" translate="FOOTER_4">Disclaimer</h2>

<p class="small"><strong>Be safe &amp; secure:</strong> <a href="https://myetherwallet.groovehq.com/knowledge_base/topics/protecting-yourself-and-your-funds" target="_blank" rel="noopener"> We highly recommend that you read our guide on How to Prevent Loss &amp; Theft for some recommendations on how to be proactive about your security.</a></p>

<p class="small"><strong>Always backup your keys: </strong> MyEtherWallet.com &amp; MyEtherWallet CX are not "web wallets". You do not create an account or give us your funds to hold onto. No data leaves your computer / your browser. We make it easy for you to create, save, and access your information and interact with the blockchain.</p>

<p class="small"><strong>We are not responsible for any loss: </strong> Ethereum, MyEtherWallet.com & MyEtherWallet CX, and some of the underlying Javascript libraries we use are under active development. While we have thoroughly tested &amp; tens of thousands of wallets have been successfully created by people all over the globe, there is always the possibility something unexpected happens that causes your funds to be lost. Please do not invest more than you are willing to lose, and please be careful.</p>

<p class="small"><strong> Translations of MyEtherWallet: </strong> The community has done an amazing job translating MyEtherWallet into a variety of languages. However, MyEtherWallet can only verify the validity and accuracy of the information provided in English and, because of this, the English version of our website is the official text. </p>

<p class="small"><strong>MIT License</strong> Copyright &copy; 2015-2017 MyEtherWallet LLC</p>

<p class="small">Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>

<p class="small">The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>

<p class="small"><strong>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</strong></p>
</div>

<div class="modal-footer">
<button class="btn btn-default" data-dismiss="modal">Okay</button>
</div>

</section>
</section>
</article>



</body>
</html>

2 changes: 1 addition & 1 deletion dist/README.md
Expand Up @@ -4,7 +4,7 @@

### [Download the Latest Release](https://github.com/kvhnuke/etherwallet/releases/latest)

- dist-vX.X.X.X.zip is the smaller package containing the gh-pages branch aka MyEtherWallet.com
- etherwallet-vX.X.X.X.zip is the smaller package containing the gh-pages branch aka MyEtherWallet.com
- chrome-extension-vX.X.X.X.zip is the chrome extension package
- source code is the full source for developers to get started with (although cloning or forking the mercury branch is probably a better choice)

Expand Down

0 comments on commit 0489500

Please sign in to comment.