diff --git a/.circleci/config.yml b/.circleci/config.yml
index edb71cd16af..85275606d88 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,7 +37,7 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-          - deps37-{{ .Branch }}-{{ checksum "requirements/base.txt" }}-alpine
+          - deps37-{{ .Branch }}-{{ checksum "requirements/ci.txt" }}-alpine
           # fallback to using the latest cache if no exact match is found
           - deps37-{{ .Branch }}-alpine
 
@@ -52,7 +52,7 @@ jobs:
             echo "Requirements installed!"
 
       - save_cache:
-          key: deps37-{{ .Branch }}-{{ checksum "requirements/base.txt" }}-alpine
+          key: deps37-{{ .Branch }}-{{ checksum "requirements/ci.txt" }}-alpine
           paths:
             - ./venv
             - "/usr/local/bin"
diff --git a/app/app/templates/search/search.html b/app/app/templates/search/search.html
index 4172608409f..a43b4cc216d 100644
--- a/app/app/templates/search/search.html
+++ b/app/app/templates/search/search.html
@@ -25,7 +25,7 @@
     <link rel="stylesheet" href={% static "v2/css/users.css" %} />
     <link rel="stylesheet" href={% static "v2/css/tag.css" %} />
     <link rel="stylesheet" href={% static "v2/css/rating.css" %} />
-    <link rel="stylesheet" href="https://unpkg.com/vue-innersearch/default-innersearch-theme.min.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/vue-innersearch@0.0.12/default-innersearch-theme.min.css">
   </head>
 
   <body id="{{ explore }}" class="interior {{active}} g-font-muli">
@@ -156,7 +156,7 @@ <h3 class="is-nlf-title">Number of Hacks Joined : </h3>
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' %}
     {% include 'shared/footer.html' %}
-    <script src="https://unpkg.com/vue-innersearch@0.0.12/vue-innersearch.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue-innersearch@0.0.12/innersearch.min.js"></script>
 
 
     <script>
diff --git a/app/assets/v2/images/grants/grants_header_donors_round_7-2.png b/app/assets/v2/images/grants/grants_header_donors_round_7-2.png
new file mode 100644
index 00000000000..52013abc007
Binary files /dev/null and b/app/assets/v2/images/grants/grants_header_donors_round_7-2.png differ
diff --git a/app/assets/v2/images/grants/grants_header_donors_round_7.png b/app/assets/v2/images/grants/grants_header_donors_round_7.png
deleted file mode 100644
index 6330fbc536c..00000000000
Binary files a/app/assets/v2/images/grants/grants_header_donors_round_7.png and /dev/null differ
diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js
index 116683a0b05..20b6ce5f8b1 100644
--- a/app/assets/v2/js/cart.js
+++ b/app/assets/v2/js/cart.js
@@ -69,6 +69,7 @@ Vue.component('grants-cart', {
       maxPossibleSignatures: 4, // for Flow A, start by assuming 4 -- two logins, set signing key, one transfer
       isZkSyncModalLoading: false, // modal requires async actions before loading, so show loading spinner to improve UX
       zkSyncWalletState: undefined, // state of user's nominal zkSync wallet
+      selectedNetwork: undefined, // use to force computed properties to update when document.web3network changes
       // SMS validation
       csrf: $("input[name='csrfmiddlewaretoken']").val(),
       validationStep: 'intro',
@@ -313,26 +314,28 @@ Vue.component('grants-cart', {
     zkSyncBlockExplorerUrl() {
       // Flow A, zkScan link
       if (this.hasSufficientZkSyncBalance) {
-        if (document.web3network === 'rinkeby')
-          return `https://${document.web3network}.zkscan.io/explorer/accounts/${this.userAddress}`;
+        if (this.selectedNetwork === 'rinkeby')
+          return `https://${this.selectedNetwork}.zkscan.io/explorer/accounts/${this.userAddress}`;
         return `https://zkscan.io/explorer/accounts/${this.userAddress}`;
       }
 
       // Flow B, etherscan link
       if (!this.zkSyncDepositTxHash)
         return undefined;
-      if (document.web3network === 'rinkeby')
-        return `https://${document.web3network}.etherscan.io/tx/${this.zkSyncDepositTxHash}`;
+      if (this.selectedNetwork === 'rinkeby')
+        return `https://${this.selectedNetwork}.etherscan.io/tx/${this.zkSyncDepositTxHash}`;
       return `https://etherscan.io/tx/${this.zkSyncDepositTxHash}`;
     },
 
     // Array of supported tokens
     zkSyncSupportedTokens() {
-      if (!document.web3network)
-        return [];
-      if (document.web3network === 'rinkeby')
+      const mainnetTokens = [ 'ETH', 'DAI', 'USDC', 'USDT', 'LINK', 'WBTC', 'PAN', 'SNT' ];
+      
+      if (!this.selectedNetwork)
+        return mainnetTokens;
+      if (this.selectedNetwork === 'rinkeby')
         return [ 'ETH', 'USDT', 'LINK' ];
-      return [ 'ETH', 'DAI', 'USDC', 'USDT', 'LINK', 'WBTC', 'PAN' ];
+      return mainnetTokens;
     },
 
     // Estimated gas limit for zkSync checkout
@@ -445,6 +448,8 @@ Vue.component('grants-cart', {
   },
 
   methods: {
+    // TODO: SMS related methos and state should be removed and refactored into the component that
+    // should be shared between the cart and the Trust Bonus tab
     dismissVerification() {
       localStorage.setItem('dismiss-sms-validation', true);
       this.showValidation = false;
@@ -707,7 +712,7 @@ Vue.component('grants-cart', {
       let wei;
 
       try {
-        wei = web3.utils.toWei(String(number));
+        wei = Web3.utils.toWei(String(number));
       } catch (e) {
         // When numbers are too small toWei fails because there's too many decimal places
         wei = Math.round(number * 10 ** 18);
@@ -1599,7 +1604,7 @@ Vue.component('grants-cart', {
           // We now need to subtract the fee from this amount, and must ensure there is
           // actually enough balance left to send this transfer. Otherwise we do not have enough
           // balance to cover the transfer fee
-          
+
           if (amount.gt(fee)) {
             // Packed account balance is greater than fee, so we can proceed with transfer
             const transferAmount = zksync.utils.closestPackableTransactionAmount(amount.sub(fee));
@@ -1618,7 +1623,7 @@ Vue.component('grants-cart', {
             const receipt = await tx.awaitReceipt();
 
             console.log('  ✅ Got transfer receipt', receipt);
-          
+
           } else {
             console.log('  ❗ Remaining balance is less than the fee, skipping this transfer');
             continue;
@@ -2109,7 +2114,7 @@ Vue.component('grants-cart', {
               const tokenAmount = await this.getTotalAmountToTransfer(tokenName, tokenDonation.allowance);
               const extra = this.zkSyncAdditionalDeposits.filter((x) => x.tokenSymbol === tokenName)[0];
               let totalAmount;
-              
+
               if (!extra) {
                 totalAmount = tokenAmount;
               } else {
@@ -2141,12 +2146,12 @@ Vue.component('grants-cart', {
           // Check tokens
           for (let i = 0; i < deposits.length; i += 1) {
             const tokenAddress = deposits[i][0];
-            
+
             if (tokenAddress === ETH_ADDRESS) {
               // Skip ETH because we check it later
               continue;
             }
-              
+
             const tokenContract = new web3.eth.Contract(token_abi, tokenAddress);
             const requiredAmount = deposits[i][1];
             const userTokenBalance = await tokenContract.methods.balanceOf(this.userAddress).call({from: this.userAddress});
@@ -2209,7 +2214,7 @@ Vue.component('grants-cart', {
 
           const extra = this.zkSyncAdditionalDeposits.filter((x) => x.tokenSymbol === tokenDonation.tokenName)[0];
           let totalAmount;
-          
+
           if (!extra) {
             totalAmount = tokenAmount;
           } else {
@@ -2479,26 +2484,35 @@ Vue.component('grants-cart', {
     this.hasSufficientZkSyncBalance = false;
 
     // Show user cart
-    this.isLoading = false;
 
     // Check zkSync balance. Used to find which checkout option is cheaper
-    try {
-      // Setup zkSync and check balances
-      this.userAddress = (await web3.eth.getAccounts())[0];
-      await this.setupZkSync();
-      await this.checkZkSyncBalances();
-
-      // See if user was previously interrupted during checkout
-      await this.checkInterruptStatus();
-      if (this.zkSyncWasInterrupted) {
-        this.showZkSyncModal = true;
+    this.isLoading = false;
+    window.addEventListener('dataWalletReady', async(e) => {
+      try {
+        await needWalletConnection();
+
+        // Force re-render so computed properties are updated (some are dependent on
+        // document.web3network, and Vue cannot watch document.web3network for an update)
+        this.selectedNetwork = document.web3network;
+        
+        // Setup zkSync and check balances
+        this.userAddress = (await web3.eth.getAccounts())[0];
+        await this.setupZkSync();
+        await this.checkZkSyncBalances();
+
+        // See if user was previously interrupted during checkout
+        await this.checkInterruptStatus();
+        if (this.zkSyncWasInterrupted) {
+          this.showZkSyncModal = true;
+        }
+      } catch (e) {
+        console.error(e);
       }
-    } catch (e) {
-      console.error(e);
-    }
+
+    }, false);
 
     // Cart is now ready
-    this.isLoading = false;
+    // this.isLoading = false;
   },
 
   beforeDestroy() {
diff --git a/app/assets/v2/js/pages/profile-trust.js b/app/assets/v2/js/pages/profile-trust.js
index 8c603892c60..b48338e8379 100644
--- a/app/assets/v2/js/pages/profile-trust.js
+++ b/app/assets/v2/js/pages/profile-trust.js
@@ -139,3 +139,234 @@ let show_brightid_verify_modal = function(brightid_uuid) {
   $(content).appendTo('body');
   $('#verify_brightid_modal').bootstrapModal('show');
 };
+
+// TODO: This component consists primarily of code taken from the SMS verification flow in the cart.
+// This approach is not DRY, and after Grants Round 7 completes, the cart should be refactored to include
+// this as a shared component, rather than duplicating the code.
+Vue.component('sms-verify-modal', {
+  delimiters: [ '[[', ']]' ],
+  data: function() {
+    return {
+      csrf: $("input[name='csrfmiddlewaretoken']").val(),
+      validationStep: 'intro',
+      showValidation: false,
+      phone: '',
+      validNumber: false,
+      errorMessage: '',
+      verified: document.verified,
+      code: '',
+      timePassed: 0,
+      timeInterval: 0,
+      display_email_option: false,
+      countDownActive: false
+    };
+  },
+  mounted: function() {
+    $(document).on('click', '#verify-sms-link', function(event) {
+      event.preventDefault();
+      this.showValidation = true;
+    }.bind(this));
+  },
+  template: `<b-modal id="sms-modal" @hide="dismissVerification()" :visible="showValidation" center hide-header hide-footer>
+              <template v-slot:default="{ hide }">
+                <div class="mx-5 mt-5 mb-4 text-center" v-if="validationStep == 'intro'">
+                  <div class="mb-3">
+                    <h1 class="font-bigger-4 font-weight-bold">Verify your phone number</h1>
+                  </div>
+                  <br />
+                  <p class="mb-4 font-subheader text-left">We'd like to verify your phone number to get your contribution matched. Phone number verification is optional.</p>
+                  <br />
+                  <p class="mb-4 font-subheader text-left">Verifying increases your trust level and impact of your contributions. You can still contribute to grants without
+                  verifying your phone number, but your contribution impact will be reduced.</p>
+                  <br />
+                  <p class="mb-4 font-subheader text-left">Gitcoin does NOT store your phone number.</p>
+                  <br />
+                  <p class="mb-4 font-subheader text-left">read more about <a target="_blank" rel="noopener noreferrer" class="gc-text-blue font-smaller-1"
+                    href="https://twitter.com/owocki/status/1271088915982675974">why we are asking for your phone number</a> or how Gitcoin <a target="_blank" rel="noopener noreferrer" class="gc-text-blue font-smaller-1"
+                      href="https://twitter.com/owocki/status/1271088915982675974">preserves your privacy.</a></p>
+                  <b-button @click="validationStep='requestVerification'" class="btn-gc-blue mb-2" size="lg">Verify
+                  Phone Number</b-button>
+                  <div class="mb-1 font-subheader text-center">
+                    <a id="verify_offline" href="#">
+                    <br />
+                    Verify Offline or</a>  <a href="#" @click="dismissVerification()" variant="link">Skip</a>
+                    <div id='verify_offline_target' style="display:none">
+                      <strong>Verify Offline</strong>
+                      <br />
+                      <a href="mailto:kyc@gitcoin.co">Email Gitcoin</a> or <a href="https://keybase.io/gitcoin_verify">Message Gitcoin on Keybase</a>, and we will verify your information within 1-2 business days.
+                      <br />
+                      IMPORTANT: Be sure to include (1) your gitcoin username (2) proof of ownership of a SMS number.
+                    </div>
+                  </div>
+                </div>
+                <div class="mx-5 my-5 text-center" v-if="validationStep == 'requestVerification'">
+                  <div class="mb-3">
+                    <h1 class="font-bigger-4 font-weight-bold">Verify your phone number</h1>
+                  </div>
+                  <p class="mb-5 font-subheader">We will send you a verification code.</p>
+                  <vue-tel-input ref="tel-input" :validCharactersOnly="true" @validate="isValidNumber" v-model="phone"
+                    :enabledCountryCode="true" :autofocus="true" :required="true" mode="international"
+                    inputClasses="form-control" placeholder="+1 8827378273"
+                    :inputOptions="{showDialCode: true}"
+                  ></vue-tel-input>
+                  <div v-if="timeInterval > timePassed">
+                    <span class="label-warning">Wait [[ timeInterval - timePassed ]] second before request another
+                      code</span>
+                  </div>
+                  <div v-if="errorMessage">
+                    <span class="label-warning">[[ errorMessage ]]</span>
+                  </div>
+                  <b-button @click="requestVerification()" class="btn-gc-blue mt-5 mb-2" size="lg">Send verification
+                    code</b-button>
+                  <br />
+                  <b-button @click="hide()" variant="link">Cancel</b-button>
+                </div>
+                <div class="mx-5 my-5 text-center" v-if="validationStep == 'verifyNumber'">
+                  <div class="mb-3">
+                    <h1 class="font-bigger-4 font-weight-bold">Verify your phone number</h1>
+                  </div>
+                  <p class="mb-5 font-subheader">Enter the verification code sent to your number.</p>
+
+                  <input class="form-control" type="number" required v-model="code">
+                  <div v-if="timeInterval > timePassed">
+                    <span class="label-warning">Wait [[ timeInterval - timePassed ]] second before request another
+                      code</span>
+                  </div>
+                  <div v-if="errorMessage">
+                    <span class="label-warning">[[ errorMessage ]]</span>
+                  </div>
+                  <b-button @click="validateCode()" class="btn-gc-blue mt-5" size="lg">Submit</b-button>
+                  <br />
+                  <b-button @click="startVerification()" variant="link">Change number</b-button>
+                  <b-button @click="resendCode()" variant="link">Resend Code</b-button>
+                    <b-button @click="resendCode('email')" variant="link" v-if="display_email_option">Send email</b-button>
+                </div>
+              </template>
+            </b-modal>`,
+  methods: {
+    dismissVerification() {
+      localStorage.setItem('dismiss-sms-validation', true);
+      this.showValidation = false;
+    },
+    // VALIDATE
+    validateCode() {
+      const vm = this;
+
+      if (vm.code) {
+        const verificationRequest = fetchData('/sms/validate/', 'POST', {
+          code: vm.code,
+          phone: vm.phone
+        }, {'X-CSRFToken': vm.csrf});
+
+        $.when(verificationRequest).then(response => {
+          vm.verificationEnabled = false;
+          vm.verified = true;
+          vm.validationStep = 'verifyNumber';
+          vm.showValidation = false;
+          _alert('You have been verified. <a href="" style="color: white; text-decoration: underline;">Refresh Page</a>.', 'success');
+        }).catch((e) => {
+          vm.errorMessage = e.responseJSON.msg;
+        });
+      }
+    },
+    startVerification() {
+      this.phone = '';
+      this.validationStep = 'requestVerification';
+      this.validNumber = false;
+      this.errorMessage = '';
+      this.code = '';
+      this.timePassed = 0;
+      this.timeInterval = 0;
+      this.display_email_option = false;
+    },
+    countdown() {
+      const vm = this;
+
+      if (!vm.countDownActive) {
+        vm.countDownActive = true;
+
+        setInterval(() => {
+          vm.timePassed += 1;
+        }, 1000);
+      }
+    },
+    resendCode(delivery_method) {
+      const e164 = this.phone.replace(/\s/g, '');
+      const vm = this;
+
+      vm.errorMessage = '';
+
+      if (vm.validNumber) {
+        const verificationRequest = fetchData('/sms/request', 'POST', {
+          phone: e164,
+          delivery_method: delivery_method || 'sms'
+        }, {'X-CSRFToken': vm.csrf});
+
+        vm.errorMessage = '';
+
+        $.when(verificationRequest).then(response => {
+          // set the cooldown time to one minute
+          this.timePassed = 0;
+          this.timeInterval = 60;
+          this.countdown();
+          this.display_email_option = response.allow_email;
+        }).catch((e) => {
+          vm.errorMessage = e.responseJSON.msg;
+        });
+      }
+    },
+    // REQUEST VERIFICATION
+    requestVerification(event) {
+      const e164 = this.phone.replace(/\s/g, '');
+      const vm = this;
+
+      if (vm.validNumber) {
+        const verificationRequest = fetchData('/sms/request', 'POST', {
+          phone: e164
+        }, {'X-CSRFToken': vm.csrf});
+
+        vm.errorMessage = '';
+
+        $.when(verificationRequest).then(response => {
+          vm.validationStep = 'verifyNumber';
+          this.timePassed = 0;
+          this.timeInterval = 60;
+          this.countdown();
+          this.display_email_option = response.allow_email;
+        }).catch((e) => {
+          vm.errorMessage = e.responseJSON.msg;
+        });
+      }
+    },
+    isValidNumber(validation) {
+      console.log(validation);
+      this.validNumber = validation.isValid;
+    }
+  }
+});
+
+$(document).ready(function() {
+  $(document).on('keyup', 'input[name=telephone]', function(e) {
+    var number = $(this).val();
+
+    if (number[0] != '+') {
+      number = '+' + number;
+      $(this).val(number);
+    }
+  });
+
+
+  $(document).on('click', '#verify_offline', function(e) {
+    $(this).remove();
+    $('#verify_offline_target').css('display', 'block');
+  });
+});
+
+if (document.getElementById('gc-sms-modal')) {
+
+  const smsVerificationApp = new Vue({
+    delimiters: [ '[[', ']]' ],
+    el: '#gc-sms-modal',
+    data: { }
+  });
+}
\ No newline at end of file
diff --git a/app/assets/v2/js/wallet.js b/app/assets/v2/js/wallet.js
index 831ef9df65a..6b90be1b223 100644
--- a/app/assets/v2/js/wallet.js
+++ b/app/assets/v2/js/wallet.js
@@ -65,6 +65,13 @@ const needWalletConnection = async() => {
   window.addEventListener('walletReady', async function(e) {
     if (!web3Modal || !web3Modal.cachedProvider) {
       return await onConnect().then(console.log);
+    } else if (web3Modal.cachedProvider === 'injected' && window.Web3Modal.getInjectedProviderName() === 'MetaMask') {
+      const accounts = await window.ethereum.request({ method: 'eth_accounts' });
+
+      if (!accounts.length) {
+        return await onConnect().then(console.log);
+      }
+
     }
   }, false);
 };
diff --git a/app/dashboard/brightid_utils.py b/app/dashboard/brightid_utils.py
index 3fcc9922ab0..af4a7ffd35d 100644
--- a/app/dashboard/brightid_utils.py
+++ b/app/dashboard/brightid_utils.py
@@ -38,7 +38,7 @@ def get_brightid_status(brightid_uuid):
         return 'unknown'
 
 def assign_brightid_sponsorship(brightid_uuid):
-    brightIDv5OpUrl = 'https://app.brightid.org/brightid/v5/operations'
+    brightIDv5OpUrl = 'https://app.brightid.org/node/v5/operations'
 
     op = {
         'name': 'Sponsor',
diff --git a/app/dashboard/templates/bounty/new_bounty.html b/app/dashboard/templates/bounty/new_bounty.html
index a66141dfc27..8ab19a3a4bd 100644
--- a/app/dashboard/templates/bounty/new_bounty.html
+++ b/app/dashboard/templates/bounty/new_bounty.html
@@ -24,7 +24,7 @@
     {% include 'shared/cards.html' %}
     <meta name="title" content="Create Funded Issue/Bounty | Gitcoin">
     <meta name="description" content="Instructions for creating an issue and posting a bounty to Gitcoin so developers across the world can discover your bounty and start working on your issue.">
-    <link rel="stylesheet" href="https://unpkg.com/vue-select@latest/dist/vue-select.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/vue-select@3.10.8/dist/vue-select.css">
     <link rel="stylesheet" href={% static "v2/css/quickstart.css" %}>
     <link rel="stylesheet" href={% static "v2/css/activity_stream.css" %}>
     <link rel="stylesheet" href={% static "v2/css/tag.css" %}>
@@ -711,7 +711,7 @@ <h5 class="text-uppercase h3 font-weight-bold mb-0">Total</h5>
     <script src="{% static "v2/js/lib/ipfs-api.js" %}"></script>
     <script src="{% static "v2/js/ipfs.js" %}"></script>
     <script src="{% static "v2/js/abi.js" %}"></script>
-    <script src="https://unpkg.com/vue-select@latest"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue-select@3.10.8/dist/vue-select.min.js"></script>
 
     <script src="{% static "v2/js/lib/polkadot/core.min.js" %}"></script>
     <script src="{% static "v2/js/lib/polkadot/extension.min.js" %}"></script>
diff --git a/app/dashboard/templates/dashboard/hackathon/new_bounty.html b/app/dashboard/templates/dashboard/hackathon/new_bounty.html
index 4954f4a89b2..8005ba4d7f7 100644
--- a/app/dashboard/templates/dashboard/hackathon/new_bounty.html
+++ b/app/dashboard/templates/dashboard/hackathon/new_bounty.html
@@ -24,7 +24,7 @@
     {% include 'shared/cards.html' %}
     <meta name="title" content="Create Funded Issue/Bounty | Gitcoin">
     <meta name="description" content="Instructions for creating an issue and posting a bounty to Gitcoin so developers across the world can discover your bounty and start working on your issue.">
-    <link rel="stylesheet" href="https://unpkg.com/vue-select@latest/dist/vue-select.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/vue-select@3.10.8/dist/vue-select.css">
 
     <style>
       .onboard-banner {
@@ -495,7 +495,7 @@ <h5 class="text-uppercase h3 font-weight-bold mb-0">Total</h5>
     <script src="{% static "v2/js/lib/ipfs-api.js" %}"></script>
     <script src="{% static "v2/js/ipfs.js" %}"></script>
     <script src="{% static "v2/js/abi.js" %}"></script>
-    <script src="https://unpkg.com/vue-select@latest"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue-select@3.10.8/dist/vue-select.min.js"></script>
 
     <script src="{% static "v2/js/lib/polkadot/core.min.js" %}"></script>
     <script src="{% static "v2/js/lib/polkadot/extension.min.js" %}"></script>
diff --git a/app/dashboard/templates/dashboard/users-elastic.html b/app/dashboard/templates/dashboard/users-elastic.html
index 73fbcc5c8ce..966a752fa66 100644
--- a/app/dashboard/templates/dashboard/users-elastic.html
+++ b/app/dashboard/templates/dashboard/users-elastic.html
@@ -20,7 +20,7 @@
 <html lang="en">
 
   <head>
-    <link rel="stylesheet" href="https://unpkg.com/vue-innersearch/default-innersearch-theme.min.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/vue-innersearch@0.0.12/default-innersearch-theme.min.css">
     {% include 'shared/head.html' %}
     {% include 'shared/cards.html' %}
     <link rel="stylesheet" href={% static "v2/css/users.css" %} />
@@ -267,7 +267,7 @@ <h5 class="text-center card-user_name">
     {% include 'shared/analytics.html' %}
     {% include 'shared/footer_scripts.html' with slim="1" %}
     <script src="https://cdnjs.cloudflare.com/ajax/libs/vuex/3.5.1/vuex.min.js"></script>
-    <script src="https://unpkg.com/vue-innersearch@0.0.12/vue-innersearch.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue-innersearch@0.0.12/innersearch.min.js"></script>
     <script>
       $('body').bootstrapTooltip({
         selector: '[data-toggle="tooltip"]'
diff --git a/app/dashboard/templates/ftux/onboard.html b/app/dashboard/templates/ftux/onboard.html
index 3eb673af0e6..14e8b642e2a 100644
--- a/app/dashboard/templates/ftux/onboard.html
+++ b/app/dashboard/templates/ftux/onboard.html
@@ -80,5 +80,5 @@
   <script src="/dynamic/js/tokens_dynamic.js"></script>
   <script src="{% static "v2/js/tokens.js" %}"></script>
   <script src="{% static "v2/js/pages/quickstart.js" %}"></script>
-  <script src="https://unpkg.com/3box/dist/3box.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/3box@1.22.0/lib/3box.min.js"></script>
 </html>
diff --git a/app/dashboard/templates/profiles/profile.html b/app/dashboard/templates/profiles/profile.html
index 38123176b8c..ddba5142f04 100644
--- a/app/dashboard/templates/profiles/profile.html
+++ b/app/dashboard/templates/profiles/profile.html
@@ -115,6 +115,7 @@
     <script src="{% static "v2/js/pages/profile.js" %}"></script>
     <script src="{% static "v2/js/pages/tribe_title.js" %}"></script>
     <script src="{% static "v2/js/pages/profile-edit.js" %}"></script>
+    <script src="{% static "v2/js/lib/vue-tel-input.min.js" %}"></script>
     <script src="{% static "v2/js/pages/profile-trust.js" %}"></script>
     <script src="{% static "v2/js/lib/qrcode.js" %}"></script>
     <script src="{% static "v2/js/rating.js" %}"></script>
diff --git a/app/dashboard/templates/profiles/tab_trust.html b/app/dashboard/templates/profiles/tab_trust.html
index 6205d7ebe96..f931ca0c33d 100644
--- a/app/dashboard/templates/profiles/tab_trust.html
+++ b/app/dashboard/templates/profiles/tab_trust.html
@@ -2,6 +2,9 @@
 
 {% if not profile.is_org and is_my_profile %}
   <div id="gc-trust-bonus-tab">
+    <div id="gc-sms-modal">
+      <sms-verify-modal></sms-verify-modald>
+    </div>
     <h3 class="py-3 font-weight-bold">Trust Bonus</h3>
     The higher the Trust
     Bonus of a user is, the more we can be confident that the user is real. Higher
@@ -40,7 +43,7 @@ <h5>Active Now</h5>
           {% if is_sms_verified %}
             <span style="color:limegreen"><i class="fas fa-check"></i> Verified</span>
           {% else %}
-            <a href="/grants/cart?verify=true" role="button" class="button button--primary text-nowrap" target="_blank">Verify</a>
+            <a href="/grants/cart?verify=true" role="button" id="verify-sms-link" class="button button--primary text-nowrap" target="_blank">Verify</a>
           {% endif %}
         </div>
       </div>
@@ -156,6 +159,4 @@ <h5>Coming Soon ™️</h5>
   <script>
     const calendarData = JSON.parse(document.getElementById('calendarData').textContent);
   </script>
-  <script src="{% static "v2/js/lib/vue-tel-input.min.js" %}"></script>
-  <script src="{% static "v2/js/lib/bootstrap-vue.min.js" %}"></script>
 {% endif %}
diff --git a/app/grants/admin.py b/app/grants/admin.py
index c8ea81e79c8..b4f0765059a 100644
--- a/app/grants/admin.py
+++ b/app/grants/admin.py
@@ -87,14 +87,14 @@ class GrantAdmin(GeneralAdmin):
     ordering = ['-id']
     fields = [
         'migrated_to',
-        'title', 'description', 'description_rich', 'reference_url', 'github_project_url', 'admin_address', 'active',
+        'title', 'description', 'grant_type', 'categories', 'description', 'description_rich', 'github_project_url', 'reference_url', 'admin_address', 'active',
         'amount_received', 'monthly_amount_subscribed',
         'deploy_tx_id', 'cancel_tx_id', 'admin_profile', 'token_symbol',
         'token_address', 'contract_address', 'contract_version', 'network', 'required_gas_price', 'logo_svg_asset',
         'logo_asset', 'created_on', 'modified_on', 'team_member_list',
         'subscriptions_links', 'contributions_links', 'logo', 'logo_svg', 'image_css',
-        'link', 'clr_prediction_curve', 'hidden', 'grant_type', 'next_clr_calc_date', 'last_clr_calc_date',
-        'metadata', 'categories', 'twitter_handle_1', 'twitter_handle_2', 'view_count', 'is_clr_eligible', 'in_active_clrs',
+        'link', 'clr_prediction_curve', 'hidden', 'next_clr_calc_date', 'last_clr_calc_date',
+        'metadata', 'twitter_handle_1', 'twitter_handle_2', 'view_count', 'is_clr_eligible', 'in_active_clrs',
         'last_update', 'funding_info', 'twitter_verified', 'twitter_verified_by', 'twitter_verified_at'
     ]
     readonly_fields = [
diff --git a/app/grants/clr.py b/app/grants/clr.py
index b24415c2013..73ea16307a4 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -408,7 +408,7 @@ def populate_data_for_clr(grants, contributions, phantom_funding_profiles, clr_r
         if len(contributing_profile_ids) > 0:
             for profile_id in contributing_profile_ids:
                 profile_contributions = contribs.filter(profile_for_clr_id=profile_id)
-                sum_of_each_profiles_contributions = float(sum([c.subscription.amount_per_period_usdt for c in profile_contributions if c.subscription.amount_per_period_usdt]))
+                sum_of_each_profiles_contributions = float(sum([c.subscription.amount_per_period_usdt * clr_round.contribution_multiplier for c in profile_contributions if c.subscription.amount_per_period_usdt]))
                 phantom_funding = grant_phantom_funding_contributions.filter(profile_id=profile_id)
                 if phantom_funding.exists():
                     sum_of_each_profiles_contributions = sum_of_each_profiles_contributions + phantom_funding.first().value
diff --git a/app/grants/management/commands/estimate_clr.py b/app/grants/management/commands/estimate_clr.py
index 2ccfb2757df..5b56ca9d494 100644
--- a/app/grants/management/commands/estimate_clr.py
+++ b/app/grants/management/commands/estimate_clr.py
@@ -70,19 +70,3 @@ def handle(self, *args, **options):
 
         else:
             print("No active CLRs found")
-
-        # Upate grants mppping to active CLR rounds
-        grants = Grant.objects.all()
-        clr_rounds = GrantCLR.objects.all()
-        for clr_round in clr_rounds:
-            grants_in_clr_round = grants.filter(**clr_round.grant_filters)
-
-            for grant in grants_in_clr_round:
-                grant_has_mapping_to_round = grant.in_active_clrs.filter(pk=clr_round.pk).exists()
-
-                if clr_round.is_active and not grant_has_mapping_to_round:
-                    grant.in_active_clrs.add(clr_round)
-                    grant.save()
-                elif not clr_round.is_active and grant_has_mapping_to_round:
-                    grant.in_active_clrs.remove(clr_round)
-                    grant.save()
diff --git a/app/grants/management/commands/reclass_grants.py b/app/grants/management/commands/reclass_grants.py
index bceeef923d0..67097452080 100644
--- a/app/grants/management/commands/reclass_grants.py
+++ b/app/grants/management/commands/reclass_grants.py
@@ -21,8 +21,8 @@
 from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.utils import timezone
-from grants.models import *
 
+from grants.models import *
 
 
 class Command(BaseCommand):
@@ -1028,4 +1028,3 @@ def handle(self, *args, **options):
                 print(f"******DERP {ele[0]} {ele[1].strip().lower()} *****")
                 print(f"******DERP {e}")
                 print("*****************************")
-
diff --git a/app/grants/migrations/0084_auto_20200917_1631.py b/app/grants/migrations/0084_auto_20200917_1631.py
new file mode 100644
index 00000000000..fa7de285cc5
--- /dev/null
+++ b/app/grants/migrations/0084_auto_20200917_1631.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2020-09-17 16:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grants', '0083_matchpledge_clr_round_num'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subscription',
+            name='gas_price',
+            field=models.DecimalField(decimal_places=18, default=1, help_text='The required gas price for the Subscription.', max_digits=50),
+        ),
+    ]
diff --git a/app/grants/migrations/0085_grantclr_contribution_multiplier.py b/app/grants/migrations/0085_grantclr_contribution_multiplier.py
new file mode 100644
index 00000000000..1789e2eda08
--- /dev/null
+++ b/app/grants/migrations/0085_grantclr_contribution_multiplier.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2020-09-18 16:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grants', '0084_auto_20200917_1631'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='grantclr',
+            name='contribution_multiplier',
+            field=models.DecimalField(decimal_places=4, default=1.0, help_text='A contribution multipler to be applied to each contribution', max_digits=10),
+        ),
+    ]
diff --git a/app/grants/models.py b/app/grants/models.py
index 3fac640ab5f..b29762171fe 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -140,6 +140,13 @@ class GrantCLR(SuperModel):
         decimal_places=2,
         max_digits=10
     )
+    contribution_multiplier = models.DecimalField(
+        help_text="A contribution multipler to be applied to each contribution",
+        default=1.0,
+        decimal_places=4,
+        max_digits=10,
+    )
+
     logo = models.ImageField(
         upload_to=get_upload_filename,
         null=True,
@@ -640,7 +647,7 @@ class Subscription(SuperModel):
     )
     gas_price = models.DecimalField(
         default=1,
-        decimal_places=4,
+        decimal_places=18,
         max_digits=50,
         help_text=_('The required gas price for the Subscription.'),
     )
@@ -1315,14 +1322,25 @@ def update_tx_status(self):
             # If case 1, proceed as normal
             if case_number == 1:
                 # actually validate token transfers
-                response = grants_transaction_validator(self, w3)
-                if len(response['originator']):
-                    self.originated_address = response['originator'][0]
-                self.validator_passed = response['validation']['passed']
-                self.validator_comment = response['validation']['comment']
-                self.tx_cleared = True
-                self.split_tx_confirmed = True
-                self.success = self.validator_passed
+                try:
+                    response = grants_transaction_validator(self, w3)
+                    if len(response['originator']):
+                        self.originated_address = response['originator'][0]
+                    self.validator_passed = response['validation']['passed']
+                    self.validator_comment = response['validation']['comment']
+                    self.tx_cleared = True
+                    self.split_tx_confirmed = True
+                    self.success = self.validator_passed
+                except Exception as e:
+                    if 'Expecting value' in str(e):
+                        self.validator_passed = True
+                        self.validator_comment = 'temporary stopgap success, alethio API failed/re-running'
+                        self.tx_cleared = True
+                        self.split_tx_confirmed = True
+                        self.success = self.validator_passed
+                    else:
+                        raise e
+
 
             elif case_number == 2:
                 # If Case 2, we get the address of the gitcoin zkSync account from events
@@ -1371,6 +1389,10 @@ def update_tx_status(self):
                 )
 
                 # Look through zkSync transfers to find one with the expected amounts
+                is_correct_recipient = False
+                is_correct_token = False
+                is_correct_amount = False
+
                 for transaction in transactions:
                     if transaction['tx']['type'] != "Transfer":
                         continue
@@ -1379,13 +1401,30 @@ def update_tx_status(self):
                     is_correct_token = transaction['tx']['token'] == expected_token
 
                     transfer_amount = Decimal(transaction['tx']['amount'])
-                    is_correct_amount = transfer_amount == expected_transfer_amount
+                    transfer_tolerance = 0.05 # use a 5% tolerance
+                    transfer_amount_min = transfer_amount * (Decimal(1 - transfer_tolerance))
+                    transfer_amount_max = transfer_amount * (Decimal(1 + transfer_tolerance))
+                    is_correct_amount = transfer_amount > transfer_amount_min and transfer_amount < transfer_amount_max
 
                     if is_correct_recipient and is_correct_token and is_correct_amount:
                         self.tx_cleared = True
                         self.success = transaction['success']
                         break
 
+                if not is_correct_recipient or not is_correct_token or not is_correct_amount:
+                    # Transaction was not found, let's find out why
+                    if len(transactions) == 0:
+                        # No transfers were found for user
+                        self.validator_comment = f"{self.validator_comment}. No transactions found"
+                    else:
+                        # Could not find expected transfer, so try list specifics about why. We
+                        # Ascannot find exactly what went wrong because: We cycle through a list of
+                        # transactions. Some may have correct recipient and token but wrong amount.
+                        # Others may have correct token and amount but wrong recipient. In such a
+                        # case we cannot distinguish exactly what the cause was for not finding the
+                        # desired transasction.
+                        self.validator_comment = f"{self.validator_comment}. Transaction not found, unknown reason"
+
             if self.success:
                 print("TODO: do stuff related to successful contribs, like emails")
             else:
diff --git a/app/grants/tasks.py b/app/grants/tasks.py
index 00a5ec278c8..8041f985d15 100644
--- a/app/grants/tasks.py
+++ b/app/grants/tasks.py
@@ -133,6 +133,7 @@ def process_grant_contribution(self, grant_id, grant_slug, profile_id, package,
         subscription.grant = grant
         subscription.comments = package.get('comment', '')
         subscription.save()
+        subscription.successful_contribution(subscription.new_approve_tx_id);
 
         # one time payments
         activity = None
@@ -160,7 +161,6 @@ def process_grant_contribution(self, grant_id, grant_slug, profile_id, package,
         # emails to grant owner
         new_supporter(grant, subscription)
         # emails to contributor
-        subscription.successful_contribution(subscription.new_approve_tx_id);
         thank_you_for_supporting(grant, subscription)
 
         update_grant_metadata.delay(grant_id)
diff --git a/app/grants/templates/grants/cart-vue.html b/app/grants/templates/grants/cart-vue.html
index 922df61428f..5ea53f4786c 100644
--- a/app/grants/templates/grants/cart-vue.html
+++ b/app/grants/templates/grants/cart-vue.html
@@ -448,8 +448,12 @@ <h1 class="col-auto text-left font-bigger-2 black" style="font-weight: bold; mar
               </div>
 
             </div>
-
-            {% comment %} SMS Verification Modal {% endcomment %}
+            {% comment %}
+              SMS Verification Modal
+              TODO: Much of this code is repeated in the Trust Bonus tab, specifically as a standalone component in
+              profile-trust.js. After Grants Round 7, this should be refactored to use a shared component between the
+              cart and the Trust Bonus tab.
+            {% endcomment %}
             <b-modal id="sms-modal" @hide="dismissVerification()" :visible="showValidation" center hide-header hide-footer>
               <template v-slot:default="{ hide }">
                 <div class="mx-5 mt-5 mb-4 text-center" v-if="validationStep == 'intro'">
@@ -533,8 +537,8 @@ <h1 class="font-bigger-4 font-weight-bold">Verify your phone number</h1>
             {% comment %} ================== START ZKSYNC MODAL =================== {% endcomment %}
             {% comment %} ========================================================= {% endcomment %}
 
-            <b-modal id="zksync-modal" :visible="showZkSyncModal" @hide="showZkSyncModal = false" 
-              class="modal-dialog modal-lg" header-border-variant="transparent" 
+            <b-modal id="zksync-modal" :visible="showZkSyncModal" @hide="showZkSyncModal = false"
+              class="modal-dialog modal-lg" header-border-variant="transparent"
               center hide-footer no-close-on-backdrop no-close-on-esc hide-header-close
             >
               <template v-slot:modal-header="{ close }">
@@ -570,7 +574,7 @@ <h1 class="font-bigger-4 font-weight-bold mt-2">
                       </h1>
                     </div>
                     {% comment %} Body {% endcomment %}
-                    <div v-if="zkSyncCheckoutStep2Status !== 'not-started'" 
+                    <div v-if="zkSyncCheckoutStep2Status !== 'not-started'"
                       class="mt-4 p-2 text-left font-smaller-1" style="background-color: #FFF6CF; width: 100%;"
                     >
                       {% comment %} Status updates for user {% endcomment %}
@@ -634,7 +638,7 @@ <h1 class="font-bigger-4 font-weight-bold mt-2">
                       </span>
                     </p>
                     <p v-else class="mt-4 text-left">
-                      You started checking out with zkSync but never completed the process. 
+                      You started checking out with zkSync but never completed the process.
                       You must complete this checkout before proceeding with any other checkouts.
                       Please follow the prompts below to complete the process.
                     </p>
@@ -645,7 +649,7 @@ <h1 class="font-bigger-4 font-weight-bold mt-2">
                     <div class="row justify-content-end font-smaller-1 font-weight-semibold text-highlight-dark-blue">
                       <div @click="showAdvancedSettings = !showAdvancedSettings" class="col-auto" style="cursor: pointer;">
                         Advanced settings <i class="ml-1 fas fa-cog"></i>
-                      </div> 
+                      </div>
                     </div>
                     <div v-if="showAdvancedSettings" class="p-3 text-left" style="background-color: #F1F1F1; width: 100%;">
                       <div>
@@ -706,7 +710,7 @@ <h1 class="font-bigger-4 font-weight-bold mt-2">
                         </div>
                       </div>
                       <div class="col-4">
-                        <button v-if="zkSyncCheckoutStep1Status === 'not-started'" 
+                        <button v-if="zkSyncCheckoutStep1Status === 'not-started'"
                           class="btn btn-gc-blue button--full shadow-none" @click="zkSyncLoginGitcoinFlow"
                         >
                           Sign in
@@ -737,8 +741,8 @@ <h1 class="font-bigger-4 font-weight-bold mt-2">
                         </div>
                       </div>
                       <div class="col-4">
-                        <button v-if="zkSyncCheckoutStep2Status === 'not-started'" 
-                          :disabled="zkSyncCheckoutStep1Status !== 'complete'" class="btn btn-gc-blue button--full shadow-none" 
+                        <button v-if="zkSyncCheckoutStep2Status === 'not-started'"
+                          :disabled="zkSyncCheckoutStep1Status !== 'complete'" class="btn btn-gc-blue button--full shadow-none"
                           @click="zkSyncBeginStep2"
                         >
                           <span v-if="hasSufficientZkSyncBalance">Sign in</span>
@@ -775,14 +779,14 @@ <h1 class="font-bigger-4 font-weight-bold mt-2">
                         </div>
                       </div>
                       <div class="col-4">
-                        <button v-if="zkSyncCheckoutStep3Status === 'not-started' && !zkSyncWasInterrupted" 
-                          :disabled="zkSyncCheckoutStep2Status === 'not-started'" 
+                        <button v-if="zkSyncCheckoutStep3Status === 'not-started' && !zkSyncWasInterrupted"
+                          :disabled="zkSyncCheckoutStep2Status === 'not-started'"
                           class="btn btn-gc-blue button--full shadow-none" @click="zkSyncBeginStep3"
                         >
                           Confirm
                         </button>
-                        <button v-else-if="zkSyncCheckoutStep3Status === 'not-started' && zkSyncWasInterrupted" 
-                          :disabled="zkSyncCheckoutStep2Status === 'not-started'" 
+                        <button v-else-if="zkSyncCheckoutStep3Status === 'not-started' && zkSyncWasInterrupted"
+                          :disabled="zkSyncCheckoutStep2Status === 'not-started'"
                           class="btn btn-gc-blue button--full shadow-none" @click="resumeZkSyncDonation"
                         >
                           Confirm
@@ -805,7 +809,7 @@ <h1 class="font-bigger-4 font-weight-bold mt-2">
                 </div>
               </template>
             </b-modal>
-                        
+
             {% comment %} ========================================================= {% endcomment %}
             {% comment %} =================== END ZKSYNC MODAL ==================== {% endcomment %}
             {% comment %} ========================================================= {% endcomment %}
@@ -833,7 +837,7 @@ <h1 class="font-bigger-4 font-weight-bold mt-2">
     {% comment %} ================================================================= {% endcomment %}
 
     <script type="text/javascript" src="https://cdn.ethers.io/lib/ethers-5.0.umd.min.js"></script>
-    <script type="text/javascript" src="https://unpkg.com/zksync@0.6.4/dist/main.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/zksync@0.6.4/dist/main.js"></script>
     <script type="text/javascript">
     (async () => {
         // Loads and compiles wasm library
diff --git a/app/grants/views.py b/app/grants/views.py
index b0608a47071..3d750de4f7a 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -131,7 +131,7 @@ def get_stats(round_type):
             continue
         keys = []
         if ele[3] == 'grants':
-            top_grants = Grant.objects.filter(active=True, grant_type__name=round_type).order_by(order_by)[0:50]
+            top_grants = Grant.objects.filter(active=True, grant_type__name=round_type).exclude(pk=86).order_by(order_by)[0:50]
             keys = [grant.title[0:43] + key for grant in top_grants]
         if ele[3] == 'profile':
             startswith = f"{ele[0]}{round_type}_"
@@ -187,7 +187,7 @@ def get_stats(round_type):
                     )
             results.append(cht)
             counter += 1
-        except:
+        except Exception as e:
             logger.exception(e)
     chart_list_str = ",".join([f'container{i}' for i in range(0, counter)])
     return results, chart_list_str
@@ -239,6 +239,7 @@ def grants_addr_as_json(request):
     response = list(set(_grants.values_list('title', 'admin_address')))
     return JsonResponse(response, safe=False)
 
+@cache_page(60 * 60)
 def grants_stats_view(request):
     cht, chart_list = None, None
     try:
@@ -544,7 +545,7 @@ def get_bg(grant_type):
     if grant_type in ['about', 'activity']:
         bg = '3.jpg'
     if grant_type != 'matic':
-        bg = '../grants/grants_header_donors_round_7.png'
+        bg = '../grants/grants_header_donors_round_7-2.png'
     if grant_type == 'matic':
         # bg = '../grants/matic-banner.png'
         bg = '../grants/matic-banner.png'
@@ -644,10 +645,10 @@ def grants_by_grant_type(request, grant_type):
             total_clr_pot = total_clr_pot + clr_round_amount if total_clr_pot else clr_round_amount
 
     if total_clr_pot:
-        if total_clr_pot > 1000 * 100:
+        if total_clr_pot > 1000 * 1000:
             int_total_clr_pot = f"{round(total_clr_pot/1000/1000, 1)}m"
-        elif total_clr_pot > 100:
-            int_total_clr_pot = f"{round(total_clr_pot/1000, 1)}k"
+        elif total_clr_pot > 1000:
+            int_total_clr_pot = f"{round(total_clr_pot/1000, 0)}k"
         else:
             int_total_clr_pot = intword(total_clr_pot)
         live_now = f'❇️ LIVE NOW! Up to ${int_total_clr_pot} Matching Funding on Gitcoin Grants' if total_clr_pot > 0 else ""
@@ -1476,8 +1477,6 @@ def zksync_set_interrupt_status(request):
 
     user_address = request.POST.get('user_address')
     deposit_tx_hash = request.POST.get('deposit_tx_hash')
-    print('deposit_tx_hash')
-    print(deposit_tx_hash)
 
     try:
         # Look for existing entry, and if present we overwrite it
@@ -1507,8 +1506,6 @@ def zksync_get_interrupt_status(request):
     try:
         result = JSONStore.objects.get(key=user_address, view='zksync_checkout')
         deposit_tx_hash = result.data
-        print('deposit_tx_hash')
-        print(deposit_tx_hash)
     except JSONStore.DoesNotExist:
         # If there's no entry for this user, assume they haven't been interrupted
         deposit_tx_hash = False
diff --git a/app/kudos/migrations/0019_tokenrequest_gas_price_overide.py b/app/kudos/migrations/0019_tokenrequest_gas_price_overide.py
new file mode 100644
index 00000000000..21cf34e9d16
--- /dev/null
+++ b/app/kudos/migrations/0019_tokenrequest_gas_price_overide.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2020-09-18 16:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('kudos', '0018_auto_20200625_1454'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tokenrequest',
+            name='gas_price_overide',
+            field=models.IntegerField(default=0, help_text='If non-zero, then the celery task will use this gas price to mint hte kudos'),
+        ),
+    ]
diff --git a/app/kudos/models.py b/app/kudos/models.py
index 278f571fb4c..d6df38050d9 100644
--- a/app/kudos/models.py
+++ b/app/kudos/models.py
@@ -677,6 +677,7 @@ class TokenRequest(SuperModel):
         'dashboard.Profile', related_name='token_requests', on_delete=models.CASCADE,
     )
     rejection_reason = models.TextField(max_length=500, default='', blank=True)
+    gas_price_overide = models.IntegerField(default=0, help_text=('If non-zero, then the celery task will use this gas price to mint hte kudos'))
 
     def __str__(self):
         """Define the string representation of a conversion rate."""
diff --git a/app/kudos/tasks.py b/app/kudos/tasks.py
index eb2dad0a92c..3b09567fb27 100644
--- a/app/kudos/tasks.py
+++ b/app/kudos/tasks.py
@@ -41,6 +41,8 @@ def mint_token_request(self, token_req_id, retry=False):
             if gas_price > delay_if_gas_prices_gt_mint and self.request.retries < self.max_retries:
                 self.retry(countdown=120)
                 return
+            if obj.gas_price_overide:
+                gas_price = obj.gas_price_overide
             tx_id = obj.mint(gas_price)
             if tx_id:
                 while not has_tx_mined(tx_id, obj.network):
diff --git a/app/marketing/management/commands/post_data.py b/app/marketing/management/commands/post_data.py
index b5a77e5a982..57dbc585b9f 100644
--- a/app/marketing/management/commands/post_data.py
+++ b/app/marketing/management/commands/post_data.py
@@ -300,7 +300,8 @@ def grants():
         total_usdt_in_carts += val[1]
     pprint(f"{round(total_usdt_in_carts/1000, 1)}k DAI-equivilent in carts, but not yet checked out yet:")
     for key, val in amount_in_carts.items():
-        pprint(f"- {round(val[0], 2)} {key} (worth {round(val[1], 2)} DAI)")
+        if val[1] > 10 and key:
+            pprint(f"- {round(val[0], 2)} {key} (worth {round(val[1], 2)} DAI)")
 
     ############################################################################3
     # top contributors
diff --git a/app/perftools/management/commands/create_page_cache.py b/app/perftools/management/commands/create_page_cache.py
index 2d1427255b1..8e30efac3a9 100644
--- a/app/perftools/management/commands/create_page_cache.py
+++ b/app/perftools/management/commands/create_page_cache.py
@@ -81,6 +81,34 @@ def create_grant_type_cache():
                 )
 
 
+def create_grant_active_clr_mapping():
+    print('create_grant_active_clr_mapping')
+    # Upate grants mppping to active CLR rounds
+    from grants.models import Grant, GrantCLR
+
+    grants = Grant.objects.all()
+    clr_rounds = GrantCLR.objects.all()
+
+    # remove all old mapping
+    for clr_round in clr_rounds:
+        _grants = clr_round.grants
+        for _grant in grants:
+            _grant.in_active_clrs.remove(clr_round)
+            _grant.save()
+
+    # update new mapping
+    active_clr_rounds = clr_rounds.filter(is_active=True)
+    for clr_round in active_clr_rounds:
+        grants_in_clr_round = grants.filter(**clr_round.grant_filters)
+
+        for grant in grants_in_clr_round:
+            grant_has_mapping_to_round = grant.in_active_clrs.filter(pk=clr_round.pk).exists()
+
+            if not grant_has_mapping_to_round:
+                grant.in_active_clrs.add(clr_round)
+                grant.save()
+
+
 def create_grant_category_size_cache():
     print('create_grant_category_size_cache')
     redis = RedisService().redis
@@ -353,6 +381,7 @@ def handle(self, *args, **options):
         create_grant_type_cache()
         create_grant_clr_cache()
         create_grant_category_size_cache()
+        create_grant_active_clr_mapping()
         if not settings.DEBUG:
             create_results_cache()
             create_hidden_profiles_cache()
diff --git a/app/retail/templates/shared/footer_scripts.html b/app/retail/templates/shared/footer_scripts.html
index 8b21cbfc095..89d4ac78f83 100644
--- a/app/retail/templates/shared/footer_scripts.html
+++ b/app/retail/templates/shared/footer_scripts.html
@@ -46,13 +46,13 @@
 
 </script>
 <!-- <script src="{% static "v2/js/lib/web3modal.min.js" %}"></script> -->
-<script src="https://unpkg.com/web3modal"></script>
+<script src="https://cdn.jsdelivr.net/npm/web3modal@1.9.0/dist/index.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/authereum@latest/authereum.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@portis/web3@2.0.0-beta.57/umd/index.min.js"></script>
 <script src="{% static "v2/js/lib/fortmatic.js" %}"></script>
 <script src="https://cdn.jsdelivr.net/npm/fortmatic@2.0.6/dist/fortmatic.js"></script>
 <!-- <script src="{% static "v2/js/lib/walletconnect-v1.0.0-beta-47.js" %}"></script> -->
-<script src="https://unpkg.com/@walletconnect/web3-provider@1.2.1/dist/umd/index.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@walletconnect/web3-provider@1.2.2/dist/umd/index.min.js"></script>
 
 <script src="{% static "v2/js/data-chains.js" %}"></script>
 <script src="{% static "v2/js/wallet.js" %}"></script>
diff --git a/app/retail/templates/shared/footer_scripts_lite.html b/app/retail/templates/shared/footer_scripts_lite.html
index 9ba490db006..67696bb70c7 100644
--- a/app/retail/templates/shared/footer_scripts_lite.html
+++ b/app/retail/templates/shared/footer_scripts_lite.html
@@ -44,13 +44,13 @@
   $.fn.bootstrapTooltip = bootstrapTooltip;
 </script>
 <!-- <script src="{% static "v2/js/lib/web3modal.min.js" %}"></script> -->
-<script src="https://unpkg.com/web3modal"></script>
+<script src="https://cdn.jsdelivr.net/npm/web3modal@1.9.0/dist/index.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/authereum@latest/authereum.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@portis/web3@2.0.0-beta.57/umd/index.min.js"></script>
 <script src="{% static "v2/js/lib/fortmatic.js" %}"></script>
 <script src="https://cdn.jsdelivr.net/npm/fortmatic@2.0.6/dist/fortmatic.js"></script>
 <!-- <script src="{% static "v2/js/lib/walletconnect-v1.0.0-beta-47.js" %}"></script> -->
-<script src="https://unpkg.com/@walletconnect/web3-provider@1.2.1/dist/umd/index.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@walletconnect/web3-provider@1.2.2/dist/umd/index.min.js"></script>
 <script src="{% static "v2/js/data-chains.js" %}"></script>
 <script src="{% static "v2/js/wallet.js" %}"></script>
 
diff --git a/docs/RUNNING_LOCALLY.md b/docs/RUNNING_LOCALLY.md
index 8e813c01643..42a18cac678 100644
--- a/docs/RUNNING_LOCALLY.md
+++ b/docs/RUNNING_LOCALLY.md
@@ -90,7 +90,7 @@ Alternatively, if any installation errors occur:
 
 ```shell
 
-~/web$ awk '!/^(-r)/' requirements/base.txt requirements/test.txt | xargs -n 1 pip3 install
+~/web$ awk '!/^(-r)/' requirements/prod.txt requirements/test.txt | xargs -n 1 pip3 install
 
 ```
 
diff --git a/requirements/base.txt b/requirements/base.txt
index 4409ae9389f..e6064bcdb6f 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -41,7 +41,6 @@ cytoolz==0.9.0
 boto==2.49.0
 google-api-python-client
 django-environ==0.4.5
-ipfshttpclient==0.6.0
 eth-utils==1.4.1
 jsondiff==1.1.1
 social-auth-app-django==3.1.0
diff --git a/requirements/ci.txt b/requirements/ci.txt
new file mode 100644
index 00000000000..9e1bae3d7ad
--- /dev/null
+++ b/requirements/ci.txt
@@ -0,0 +1,3 @@
+-r base.txt
+ipfshttpclient==0.6.0
+
diff --git a/requirements/prod.txt b/requirements/prod.txt
new file mode 100644
index 00000000000..f000df9a1c9
--- /dev/null
+++ b/requirements/prod.txt
@@ -0,0 +1,3 @@
+-r base.txt
+ipfshttpclient==0.4.13
+
diff --git a/requirements/test.txt b/requirements/test.txt
index 1669aec20fa..2aa28191062 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -12,4 +12,5 @@ requests_mock==1.5.2
 idna==2.7
 django-test-plus==1.1.1
 git+https://github.com/google/yapf.git#egg=yapf
-django-debug-toolbar
\ No newline at end of file
+django-debug-toolbar
+ipfshttpclient==0.6.0
diff --git a/scripts/crontab b/scripts/crontab
index 33a329901c4..72e187a118b 100644
--- a/scripts/crontab
+++ b/scripts/crontab
@@ -128,7 +128,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/us
 50 * * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash update_brightid_status  >> /var/log/gitcoin/update_brightid_status.log  2>&1
 
 ## FEE ADDRESS CONVERSION
-0 * * * * cd gitcoin/coin; bash scripts/run_management_command.bash feeSwapper
+## 0 * * * * cd gitcoin/coin; bash scripts/run_management_command.bash feeSwapper
 
 30 0 * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash setup_grants_clr_3 >>  /var/log/gitcoin/setup_clr_round_3.log  2>&1
 
diff --git a/scripts/debug/grants_revalidatte_contributions.py b/scripts/debug/grants_revalidatte_contributions.py
new file mode 100644
index 00000000000..88f85b8b09f
--- /dev/null
+++ b/scripts/debug/grants_revalidatte_contributions.py
@@ -0,0 +1,17 @@
+from django.utils import timezone
+
+from grants.models import *
+
+search_str = 'Expecting value:' #alethio issue
+search_str = 'tuple index out of range' #unknown
+search_str = 'zkSync' #zksync issue
+num_to_process = 100
+
+start = timezone.now() - timezone.timedelta(hours=24)
+contributions = Contribution.objects.filter(created_on__gt=start).order_by('-created_on')
+contributions = contributions.filter(validator_comment__icontains=search_str)
+contributions = contributions[:num_to_process]
+for contrib in contributions:
+    print(contrib.pk)
+    contrib.update_tx_status()
+    contrib.save()
diff --git a/scripts/debug/recreate_subscriptions_contributoins_.py b/scripts/debug/recreate_subscriptions_contributoins_.py
new file mode 100644
index 00000000000..f675c0127df
--- /dev/null
+++ b/scripts/debug/recreate_subscriptions_contributoins_.py
@@ -0,0 +1,11 @@
+# for recreating contributions that failed to crate contributions
+from django.utils import timezone
+
+from grants.models import *
+
+counter = 0
+for subscription in Subscription.objects.filter(created_on__gt=timezone.datetime(2020, 9, 14)):
+    if not subscription.subscription_contribution.exists():
+        counter += 1
+        print(counter, subscription.pk, subscription.token_address, subscription.amount_per_period, subscription.amount_per_period_usdt)
+        subscription.successful_contribution(subscription.new_approve_tx_id);
diff --git a/scripts/deploy.bash b/scripts/deploy.bash
index 728f5602eb4..e707989dc43 100755
--- a/scripts/deploy.bash
+++ b/scripts/deploy.bash
@@ -49,7 +49,7 @@ git pull origin "$BRANCH"
 
 # deploy hooks
 echo "- install req"
-{ pip3 install -r requirements/base.txt >> /dev/null; } 2>&1
+{ pip3 install -r requirements/prod.txt >> /dev/null; } 2>&1
 
 echo "- cleaning up pyc files"
 find . -name \*.pyc -delete
