diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js index ff1ff5bef65..fb878fb033c 100644 --- a/app/assets/v2/js/cart.js +++ b/app/assets/v2/js/cart.js @@ -37,6 +37,11 @@ Vue.component('grants-cart', { data: function() { return { // Checkout, shared + selectedZcashPayment: 'taddress', + optionsZcashPayment: [ + { text: 'Wallet t-address', value: 'taddress' }, + { text: 'Transaction Hash', value: 'txid' } + ], chainId: '', network: 'mainnet', tabSelected: 'ETH', diff --git a/app/grants/sync/zcash.py b/app/grants/sync/zcash.py index 4520f0a4749..8ed4b1fcb28 100644 --- a/app/grants/sync/zcash.py +++ b/app/grants/sync/zcash.py @@ -7,6 +7,7 @@ def find_txn_on_zcash_explorer(contribution): + subscription = contribution.subscription grant = subscription.grant token_symbol = subscription.token_symbol @@ -27,17 +28,27 @@ def find_txn_on_zcash_explorer(contribution): # Check contributors txn history if response['status'] == 'success' and response['data'] and response['data']['txs']: txns = response['data']['txs'] + for txn in txns: if txn.get('outgoing') and txn['outgoing']['outputs']: for output in txn['outgoing']['outputs']: - if ( - output['address'] == to_address and - response['data']['address'] == from_address and - float(output['value']) == float(amount) and - is_txn_done_recently(txn['time']) and - not txn_already_used(txn['txid'], token_symbol) - ): - return txn['txid'] + if contribution.tx_id and contribution.tx_id != '0x0': + if txn['txid'] == contribution.tx_id: + if ( + output['address'] == to_address and + float(output['value']) == float(amount) and + is_txn_done_recently(txn['time']) + ): + return txn['txid'] + else: + if ( + output['address'] == to_address and + response['data']['address'] == from_address and + float(output['value']) == float(amount) and + is_txn_done_recently(txn['time']) and + not txn_already_used(txn['txid'], token_symbol) + ): + return txn['txid'] url = f'https://sochain.com/api/v2/address/ZEC/{to_address}' @@ -59,7 +70,7 @@ def find_txn_on_zcash_explorer(contribution): return None -def get_zcash_txn_status(txnid): +def is_zcash_txn_successful(txnid): if not txnid: return None @@ -90,18 +101,58 @@ def is_txn_done_recently(time_of_txn): return False +def is_valid_zcash_txn(contribution): + + subscription = contribution.subscription + grant = subscription.grant + + txn_id = contribution.tx_id + to_address = grant.zcash_payout_address + amount = subscription.amount_per_period + token_symbol = subscription.token_symbol + + + if not txn_id or txn_id == '0x0': + return None + + url = f'https://sochain.com/api/v2/tx/ZEC/{txn_id}' + + response = requests.get(url).json() + + if ( + response['status'] == 'success' and + response['data'] and + response['data']['outputs'] + ): + for txn in response['data']['outputs']: + if ( + txn['address'] == to_address and + float(txn['value']) == float(amount) and + is_txn_done_recently(response['data']['time']) and + not txn_already_used(txn_id, token_symbol) + ): + return True + + return None + + def sync_zcash_payout(contribution): -# if not contribution.tx_id: - txn = find_txn_on_zcash_explorer(contribution) - if txn: - contribution.tx_id = txn - contribution.save() + is_sucessfull_txn = False -# if contribution.tx_id: - is_sucessfull_txn = get_zcash_txn_status(contribution.tx_id) - if is_sucessfull_txn: - contribution.success = True - contribution.tx_cleared = True - contribution.checkout_type = 'zcash_std' - record_contribution_activity(contribution) + if not contribution.tx_id or contribution.tx_id == '0x0': + # user entered t-addr. + txn = find_txn_on_zcash_explorer(contribution) + if txn: + contribution.tx_id = txn contribution.save() + is_sucessfull_txn = is_zcash_txn_successful(contribution.tx_id) + else: + # user entered txn-id or txn-id picked up by cron. + is_sucessfull_txn = is_valid_zcash_txn(contribution) + + if is_sucessfull_txn: + contribution.success = True + contribution.tx_cleared = True + contribution.checkout_type = 'zcash_std' + record_contribution_activity(contribution) + contribution.save() diff --git a/app/grants/templates/grants/cart-vue.html b/app/grants/templates/grants/cart-vue.html index 6a1c7de52a9..4d65b9c30bb 100644 --- a/app/grants/templates/grants/cart-vue.html +++ b/app/grants/templates/grants/cart-vue.html @@ -533,22 +533,28 @@

-

Step 2: Copy and paste your Contributor Address below, and press the confirm button.

-
- -
+
+
- - + + + Only t-address are allowed (no z-address support)
-
- +
+
[[grant.error]]
diff --git a/app/grants/templates/grants/transaction.html b/app/grants/templates/grants/transaction.html index 09e2b83509b..01a8b24e888 100644 --- a/app/grants/templates/grants/transaction.html +++ b/app/grants/templates/grants/transaction.html @@ -30,8 +30,13 @@
- {% if not transaction.tx_cleared %}
(Pending) {% endif %} - {% if not transaction.success %}
(Failed) {% endif %} + + {% if not transaction.success %} + ( Failed ) + {% elif not transaction.tx_cleared %} + ( Pending ) + {% endif %} +
{% if not transaction.subscription.contributor_profile.hide_wallet_address %}
diff --git a/app/grants/views.py b/app/grants/views.py index 1c429ee7fb6..bc314d2b56f 100644 --- a/app/grants/views.py +++ b/app/grants/views.py @@ -2719,21 +2719,15 @@ def contribute_to_grants_v1(request): continue contributor_address = contribution.get('contributor_address', None) - if not contributor_address: + tx_id = contribution.get('tx_id', None) + + if not contributor_address and not tx_id: invalid_contributions.append({ 'grant_id': grant_id, - 'message': 'error: contributor_address is mandatory param' + 'message': 'error: either contributor_address or tx_id must be supplied' }) continue - # tx_id = contribution.get('tx_id', None) - # if not tx_id: - # invalid_contributions.append({ - # 'grant_id': grant_id, - # 'message': 'error: tx_id is mandatory param' - # }) - # continue - token_symbol = contribution.get('token_symbol', None) if not token_symbol: invalid_contributions.append({ @@ -2765,7 +2759,6 @@ def contribute_to_grants_v1(request): }) continue - tx_id = contribution.get('tx_id', None) comment = contribution.get('comment', '') network = grant.network hide_wallet_address = contribution.get('hide_wallet_address', None) diff --git a/app/ptokens/templates/buy_a_token.html b/app/ptokens/templates/buy_a_token.html index da06fffffd8..598a067a8b2 100644 --- a/app/ptokens/templates/buy_a_token.html +++ b/app/ptokens/templates/buy_a_token.html @@ -80,12 +80,12 @@

{%trans "Buy a Token" %}

{%trans "With personal tokens, you can buy a stake of someone's future work potential today." %}

-

{%trans "Reserve an Expert" %}

+

{%trans "Get Specialist's Attention" %}

- {%trans "Eager to work with a top-tier user but not sure what you’ll need them for?" %}
+ {%trans "Eager to work with a top tier contributor?" %}

- {%trans "Snagging their personal token secures their attention for your next project." %}
+ {%trans "Securing their personal token opens the opportunity for future work if your request is accepted." %}

{%trans "Support a Creator" %}

@@ -140,12 +140,12 @@

{%trans "Get Paid Today for Work Tomorrow" %}

{%trans "Customize your skillset to match where you excel." %}

-

{%trans "Control Your Worth" %}

+

{%trans "Boost Your Reliability" %}

- {%trans "Determine your own rates and keep 100% of the profits." %}
+ {%trans "Show funders that you can be trusted to complete specialized tasks." %}

- {%trans "Change your costs to respond to trends and client demand." %}
+ {%trans "Successfully completing redemptions boosts your ability to receive future work." %}

{%trans "Solidify Your Reputation" %}

diff --git a/app/ptokens/templates/personal_tokens.html b/app/ptokens/templates/personal_tokens.html index 20e82bf712c..172191528dd 100644 --- a/app/ptokens/templates/personal_tokens.html +++ b/app/ptokens/templates/personal_tokens.html @@ -60,7 +60,7 @@

{%trans "Why Personal Tokens?" %}

- {%trans "As a freelancer, personal tokens allow you to sell your reputation by borrowing against future work. Issue personal tokens and receive DAI today for work to be performed tomorrow." %}
+ {%trans "As a freelancer, personal tokens enable pre-payment for future tasks or services. Issue personal tokens and receive DAI today for work to be performed tomorrow." %}

{%trans "Looking to secure top-tier talent for your next project? Buy a personal token and redeem it for predefined uses from industry-leading professionals before they get booked up." %}
@@ -79,7 +79,6 @@

{%trans "What Are Personal Tokens?" %}

- {%trans "Tokenized IOUs for Gitcoin users time" %}

- {%trans "Used to redeem specialized skills" %}

- {%trans "Unique to each account" %}

-

- {%trans "Highly reputation based" %}

{%trans "Curious to learn more? Dive in!" %}

{%trans "Quick Start" %} diff --git a/scripts/debug/output_weekly_mailing_list.py b/scripts/debug/output_weekly_mailing_list.py new file mode 100644 index 00000000000..01650863057 --- /dev/null +++ b/scripts/debug/output_weekly_mailing_list.py @@ -0,0 +1,28 @@ +f = open("output.csv", "w") +import time + +from marketing.models import EmailSubscriber +from marketing.utils import func_name, get_or_save_email_subscriber, should_suppress_notification_email + +queryset = EmailSubscriber.objects.all() +count = queryset.count() +counter = 0 +start_time = time.time() + +for email in queryset: + counter += 1 + to_email = email.email + f_name = '' + if email.profile: + f_name = email.profile.data.get('name') + if not f_name: + f_name = '' + + if not should_suppress_notification_email(to_email, 'roundup'): + pct_done = (round(counter / count, 2) * 100) + if counter % 100 == 0: + speed = counter / (time.time() - start_time) + eta = count / speed + print(f"{pct_done}% - {counter}/{count} ({round(speed, 1)}/s, eta:{round(eta,1)}s)") + f.write(f"\"{f_name}\", \",\", \"{to_email}\"\n") +f.close()