Merge remote-tracking branch 'upstream/stable'

gitcoinco · Dec 9, 2020 · b413bde · b413bde
2 parents 6ffe770 + f6fc018
commit b413bde
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/app/economy/tx.py b/app/economy/tx.py
@@ -203,12 +203,15 @@ def grants_transaction_validator(contribution, w3):
         # Validator currently assumes msg.sender == originator as described above
         response['originator'] = [ receipt['from'] ]
 
-        # Return if recipient is not the BulkCheckout contract
-        is_bulk_checkout = is_bulk_checkout_tx(receipt)
-        if not is_bulk_checkout:
-            to_address = receipt['to']
-            response['validation']['comment'] = f'This function only validates transactions through the BulkCheckout contract, but this transaction was sent to {to_address}'
-            return response
+        # The below check was commented out since it wrongly fails for transactions sent via Argent
+        # and other wallets that use meta-transactions or relayers
+
+        # # Return if recipient is not the BulkCheckout contract
+        # is_bulk_checkout = is_bulk_checkout_tx(receipt)
+        # if not is_bulk_checkout:
+        #     to_address = receipt['to']
+        #     response['validation']['comment'] = f'This function only validates transactions through the BulkCheckout contract, but this transaction was sent to {to_address}'
+        #     return response
 
         # Parse receipt logs to look for expected transfer info. We don't need to distinguish
         # between ETH and token transfers, and don't need to look at any other receipt parameters,

diff --git a/app/grants/templates/grants/cart-vue.html b/app/grants/templates/grants/cart-vue.html
@@ -406,7 +406,7 @@ <h1 class="col-auto text-left font-bigger-2 black" style="font-weight: bold; mar
                                       class="btn btn-gc-blue button--full shadow-none py-3 mt-1"
                                       :disabled="cart.unsupportedTokens.length > 0"
                                       id='js-zkSyncfundGrants-button'
-                                      v-b-tooltip.hover.top="'zkSync is a scaling solution for Ethereum. Its enables extremely low cost transfers of ETH and ERC20 tokens in the Ethereum network (Cheaper option).'"
+                                      v-b-tooltip.hover.top="'zkSync is a scaling solution for Ethereum. It enables extremely low cost transfers of ETH and ERC20 tokens but requires locking funds in layer 2 (cheaper option).'"
                                     >
                                       Checkout with zkSync
                                     </button>
@@ -499,7 +499,7 @@ <h1 class="font-bigger-4 font-weight-bold mt-2">Pay with zkSync</h1>
                                 {% comment %} End HTML Template for cart-ethereum-zksync.js {% endcomment %}
                                 </div>
                               <div class="col-auto">
-                                <button class="btn btn-outline-gc-blue shadow-none py-3 mt-1" id='js-fundGrants-button' @click="standardCheckout" :disabled="isCheckoutOngoing" v-b-tooltip.hover.top="'Tranditional Ethereum easy payouts with your connected wallet funds (Easiest option).'">
+                                <button class="btn btn-outline-gc-blue shadow-none py-3 mt-1" id='js-fundGrants-button' @click="standardCheckout" :disabled="isCheckoutOngoing" v-b-tooltip.hover.top="'Traditional Ethereum easy payout using funds from your connected wallet (easiest option).'">
                                   Standard Checkout
                                 </button>
                               </div>