Initial commit for EthOS redemption

Author: eswarasai

.editorconfig

@@ -10,5 +10,5 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 # 4 space indentation
-[*.{py}]
+[*.py]
 indent_size = 4

app/app/settings.py

@@ -394,8 +394,18 @@
 WEB3_HTTP_PROVIDER = env('WEB3_HTTP_PROVIDER', default='https://rinkeby.infura.io')
 
 # COLO Coin
-COLO_ACCOUNT_ADDRESS = env('COLO_ACCOUNT_ADDRESS', default='')
-COLO_ACCOUNT_PRIVATE_KEY = env('COLO_ACCOUNT_PRIVATE_KEY', default='')
+COLO_ACCOUNT_ADDRESS = env('COLO_ACCOUNT_ADDRESS', default='') # TODO
+COLO_ACCOUNT_PRIVATE_KEY = env('COLO_ACCOUNT_PRIVATE_KEY', default='') # TODO
+
+# EthOS
+ETHOS_CONTRACT_ADDRESS = env('ETHOS_CONTRACT_ADDRESS', default='') # TODO
+ETHOS_ACCOUNT_ADDRESS = env('ETHOS_ACCOUNT_ADDRESS', default='') # TODO
+ETHOS_ACCOUNT_PRIVATE_KEY = env('ETHOS_ACCOUNT_PRIVATE_KEY', default='') # TODO
+
+ETHOS_TWITTER_CONSUMER_KEY = env('ETHOS_TWITTER_CONSUMER_KEY', default='') # TODO
+ETHOS_TWITTER_CONSUMER_SECRET = env('ETHOS_TWITTER_CONSUMER_SECRET', default='') # TODO
+ETHOS_TWITTER_ACCESS_TOKEN = env('ETHOS_TWITTER_ACCESS_TOKEN', default='') # TODO
+ETHOS_TWITTER_ACCESS_SECRET = env('ETHOS_TWITTER_ACCESS_SECRET', default='') # TODO
 
 # Silk Profiling and Performance Monitoring
 ENABLE_SILK = env.bool('ENABLE_SILK', default=False)

app/app/urls.py

@@ -30,6 +30,7 @@
 import dashboard.views
 import dataviz.d3_views
 import dataviz.views
+import ethos.views
 import external_bounties.views
 import faucet.views
 import gitcoinbot.views
@@ -39,7 +40,6 @@
 import retail.emails
 import retail.views
 import tdi.views
-import ethos.views
 from dashboard.router import router as dbrouter
 from external_bounties.router import router as ebrouter
 
@@ -119,6 +119,8 @@
 
     # redeem coin
     url(r'^coin/redeem/(.*)/?', dashboard.views.redeem_coin, name='redeem'),
+
+    # EthOS
     url(r'^ethos/(.*)/?', ethos.views.redeem_coin, name='redeem_coin'),
 
     # images

app/assets/yge/redeem_ethos.js

@@ -1,24 +1,17 @@
 /* eslint-disable no-console */
 window.onload = function() {
-
   setTimeout(function() {
     $('loading').style.display = 'none';
-
-    if (coin_status === 'INITIAL') {
-      $('send_eth').style.display = 'block';
-    } else if (coin_status === 'PENDING') {
-      $('send_eth_done').style.display = 'block';
-      $('colo_txid').innerHTML = '<a href="https://' + etherscanDomain() + '/tx/' + colo_txid + '" target="_blank" rel="noopener noreferrer">See your transaction on the blockchain here</a>';
-    }
+    $('send_eth').style.display = 'block';
   }, 500);
 };
 
 function redeemCoin() {
   mixpanel.track('Redeem Coin Click', {});
   metaMaskWarning();
 
-  var forwarding_address = $('forwarding_address').value.trim();
-  var twitter_usernanme = $('#twitter_username').value;
+  var forwarding_address = $('forwarding_address').value;
+  var twitter_username = $('twitter_username').value;
 
   // Check for valid address
   isValidForwardingAddress = forwarding_address.indexOf('0x') != -1;
@@ -27,14 +20,21 @@ function redeemCoin() {
     return;
   }
 
+  // Check for twitter username
+  if (!twitter_username) {
+    _alert({message: gettext('Please enter your Twitter username')}, 'error');
+    return;
+  }
+
   var sendEthInnerHTML = $('send_eth').innerHTML;
 
   $('send_eth').innerHTML = '<img src="/static/yge/images/loading_v2.gif" style="max-width: 70px; max-height: 70px;"><br><h4>Submitting to the blockchain...</h4>';
 
   fetch(window.location.href, {
     method: 'POST',
     body: JSON.stringify({
-      address: forwarding_address
+      address: forwarding_address.trim(),
+      username: twitter_username.trim()
     })
   })
     .then(
@@ -52,6 +52,13 @@ function redeemCoin() {
             }
 
             $('send_eth').innerHTML = sendEthInnerHTML;
+
+            // Prefill the input fields as the form is attached dynamically to the DOM
+            setTimeout(function() {
+              document.getElementById('send_eth').querySelector('#forwarding_address').value = forwarding_address;
+              document.getElementById('send_eth').querySelector('#twitter_username').value = twitter_username;
+            }, 100);
+
             mixpanel.track('Redeem EthOS Coin Error', {
               error: data.message
             });

app/ethos/admin.py

@@ -1,3 +1,11 @@
 from django.contrib import admin
 
+from ethos.models import Hop
+
 # Register your models here.
+
+class GeneralAdmin(admin.ModelAdmin):
+    ordering = ['-id']
+
+
+admin.site.register(Hop, GeneralAdmin)

app/ethos/management/__init__.py

@@ -0,0 +1,38 @@
+'''
+    Copyright (C) 2017 Gitcoin Core
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+'''
+
+from django.core.management.base import BaseCommand
+from django.utils.crypto import get_random_string
+
+from ethos.models import ShortCode
+
+
+class Command(BaseCommand):
+    help = 'generates some ethos shortcodes'
+
+    def add_arguments(self, parser):
+        parser.add_argument('count', type=int)
+
+    def handle(self, *args, **options):
+        short_codes = []
+        for i in range(0, options['count']):
+            shortcode = get_random_string(8)
+            short_codes.append(ShortCode(shortcode=shortcode))
+            print(f'https://gitcoin.co/ethos/{shortcode}')
+
+        ShortCode.objects.bulk_create(short_codes)

app/ethos/management/commands/__init__.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.0.4 on 2018-04-15 19:27
+# Generated by Django 2.0.4 on 2018-05-04 16:39
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -19,8 +19,10 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('created_on', models.DateTimeField(db_index=True, default=economy.models.get_time)),
                 ('modified_on', models.DateTimeField(default=economy.models.get_time)),
+                ('ip', models.GenericIPAddressField(protocol='IPv4')),
                 ('twitter_username', models.CharField(max_length=255)),
-                ('twitter_profile', models.URLField()),
+                ('twitter_profile_pic', models.URLField()),
+                ('txid', models.CharField(default='', max_length=255)),
                 ('web3_address', models.CharField(max_length=255)),
                 ('previous_hop', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ethos.Hop')),
             ],
@@ -41,4 +43,9 @@ class Migration(migrations.Migration):
                 'verbose_name_plural': 'ShortCodes',
             },
         ),
+        migrations.AddField(
+            model_name='hop',
+            name='shortcode',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='actions', to='ethos.ShortCode'),
+        ),
     ]

app/ethos/management/commands/generate_ethos_shortcode.py

@@ -17,8 +17,9 @@
 '''
 
 from django.db import models
+
 from economy.models import SuperModel
-from django.utils.text import slugify
+
 
 class ShortCode(SuperModel):
     """Define the shortcode schema"""
@@ -27,7 +28,7 @@ class Meta:
         """Define metadata associated with ShortCode."""
 
         verbose_name_plural = 'ShortCodes'
-    
+
     num_scans = models.PositiveSmallIntegerField(default=0)
     shortcode = models.CharField(max_length=255, default='')
 
@@ -39,7 +40,10 @@ class Meta:
 
         verbose_name_plural = 'Hops'
 
+    ip = models.GenericIPAddressField(protocol='IPv4')
     twitter_username = models.CharField(max_length=255)
-    twitter_profile = models.URLField()
+    twitter_profile_pic = models.URLField()
+    txid = models.CharField(max_length=255, default='')
     web3_address = models.CharField(max_length=255)
-    previous_hop = models.ForeignKey("self", on_delete=models.SET_NULL, blank=True, null=True)
+    previous_hop = models.ForeignKey("self", on_delete=models.SET_NULL, blank=True, null=True)
+    shortcode = models.ForeignKey(ShortCode, related_name='actions', on_delete=models.CASCADE, null=True)

app/ethos/migrations/0001_initial.py

@@ -76,20 +76,5 @@ <h2>{%trans "Enter your name to continue." %}</h2>
       <br>
     </div>
   </div>
-  <div id="send_eth_done" style="display:none;">
-    <h1>{% trans "Congrats!" %}</h1>
-    <p>{% trans "You've redeemed EthOS." %}<br /><span id="colo_txid"></span>.</p>
-  </div>
-  {% if coin_status %}
-    <script type="text/javascript">
-      var coin_status = '{{ coin_status }}';
-    </script>
-  {% endif %}
-  {% if colo_txid %}
-    <script type="text/javascript">
-      var colo_txid = '{{ colo_txid }}';
-      document.suppressweb3alert = true;
-    </script>
-  {% endif %}
 </section>
 {% endblock %}