Merge pull request #1016 from ethereum/dev

Deploy v1.5.5

Author: samajammin

.all-contributorsrc

@@ -1575,6 +1575,24 @@
         "content",
         "review"
       ]
+    },
+    {
+      "login": "cooganb",
+      "name": "cooganb",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/8144425?v=4",
+      "profile": "https://github.com/cooganb",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "drequinox",
+      "name": "drequinox",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/34604812?v=4",
+      "profile": "https://github.com/drequinox",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1,5 +1,5 @@
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-170-orange.svg?style=flat-square)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-172-orange.svg?style=flat-square)](#contributors)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <h1 align="center" style="margin-top: 1em; margin-bottom: 3em;">
@@ -448,6 +448,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://github.com/arturgontijo"><img src="https://avatars0.githubusercontent.com/u/15108323?v=4" width="100px;" alt=""/><br /><sub><b>Artur Gontijo</b></sub></a><br /><a href="#ideas-arturgontijo" title="Ideas, Planning, & Feedback">🤔</a></td>
     <td align="center"><a href="https://github.com/ethjoe"><img src="https://avatars0.githubusercontent.com/u/36374665?v=4" width="100px;" alt=""/><br /><sub><b>ethjoe</b></sub></a><br /><a href="#content-ethjoe" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/pulls?q=is%3Apr+reviewed-by%3Aethjoe" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/cooganb"><img src="https://avatars2.githubusercontent.com/u/8144425?v=4" width="100px;" alt=""/><br /><sub><b>cooganb</b></sub></a><br /><a href="#ideas-cooganb" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/drequinox"><img src="https://avatars1.githubusercontent.com/u/34604812?v=4" width="100px;" alt=""/><br /><sub><b>drequinox</b></sub></a><br /><a href="#content-drequinox" title="Content">🖋</a></td>
   </tr>
 </table>
 

docs/.vuepress/config.js

@@ -46,8 +46,6 @@ module.exports = {
       {},
       `
         var _paq = window._paq || [];
-        /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-        _paq.push(['setCookieDomain', '*.ethereum.org']);
         _paq.push(['trackPageView']);
         _paq.push(['enableLinkTracking']);
         (function() {
@@ -59,11 +57,6 @@ module.exports = {
         })();
         `
     ],
-    [
-      'noscript',
-      {},
-      `<p><img src="//matomo.ethereum.org/piwik/matomo.php?idsite=4&amp;rec=1" style="border:0;" alt="" /></p>`
-    ],
     [
       'script',
       { type: 'application/ld+json' },

docs/.vuepress/theme/components/Footer.vue

@@ -206,7 +206,7 @@ export default {
               display: true
             },
             {
-              to: 'https://ecosystem.support',
+              to: 'https://esp.ethereum.foundation',
               text: 'Ecosystem Support Program',
               isExternal: true,
               display: true

docs/.vuepress/theme/components/__tests__/__snapshots__/Footer.spec.js.snap

@@ -155,7 +155,7 @@ exports[`Footer render successfully 1`] = `
      
     <li>
       <a
-        href="https://ecosystem.support/"
+        href="https://esp.ethereum.foundation/"
         rel="noopener noreferrer"
         target="_blank"
       >

docs/community/index.md

@@ -157,7 +157,7 @@ Hundreds of thousands of Ethereum enthusiasts gather in these online forums to s
 **Every month, there are major Ethereum events around the world.** Consider attending one near you to meet more people in the community, learn about employment opportunities, and develop new skills.
 
 - [Dragon Quest](https://hackathon.metacartel.org/) (MetaCartel) - _Virtual Hackathon_ (April 1-30, 2020)
-- [HackMoney](https://hackathon.money/) - _Virtual Hackathon_ (30 days, Starting Mid-April, 2020)
+- [HackMoney](https://hackathon.money/) - (ETHGlobal) _Virtual Hackathon_ (30 days, Starting Mid-April, 2020)
 - [ETHTurin](https://ethturin.com/) - _Virtual Hackathon_ (April 24-26, 2020)
 - [Ethereal](https://www.etherealsummit.com/) (ConsenSys) - _Virtual Conference_ (May 7-8, 2020)
 
@@ -184,15 +184,15 @@ The Ethereum community includes people of many different backgrounds and skillse
 - Attend an [ETHGlobal](http://ethglobal.co/) hackathon near you!
 - Check out [projects related to your area of expertise or programming language of choice](/developers/#language-specific-resources)
 - Watch or participate in the [Core Dev calls](https://www.youtube.com/playlist?list=PLaM7G4Llrb7zfMXCZVEXEABT8OSnd4-7w)
-- [Ecosystem Support Program's wishlist](https://ecosystem.support/wishlist/) - tooling, documentation, and infrastructure areas where the Ethereum Ecosystem Support Program is actively seeking grant applications
+- [Ecosystem Support Program's wishlist](https://esp.ethereum.foundation/wishlist/) - tooling, documentation, and infrastructure areas where the Ethereum Ecosystem Support Program is actively seeking grant applications
 
 **Researchers & Academics**
 
 Do you have a background in mathematics, cryptography, or economics? You might be interested in some of the cutting-edge work being done within the Ethereum ecosystem
 
 - [Challenges.ethereum.org](https://challenges.ethereum.org/) - a series of high-value research bounties, where you can earn >\$100,000 USD
 - [Ethresear.ch](https://ethresear.ch) - Ethereum’s primary forum for research, and the world’s most influential forum for cryptoeconomics
-- [Ecosystem Support Program's wishlist](https://ecosystem.support/wishlist/) - research areas where the Ethereum Ecosystem Support Program is actively seeking grant applications
+- [Ecosystem Support Program's wishlist](https://esp.ethereum.foundation/wishlist/) - research areas where the Ethereum Ecosystem Support Program is actively seeking grant applications
 
 **Have non-technical skills, and aren’t sure where to start?**
 
@@ -216,7 +216,7 @@ If you’re not a developer, it can be hard to know where to start in Ethereum.
 
 **Product Managers**
 
-- The Ethereum ecosystem needs your talents! Many companies are hiring for product manager roles. If you want to start by contributing to an open source project, get in touch with the [Ethereum Cat Herder](https://gitter.im/ethereum-cat-herders/community?source=orgpage)s or [MetaCartel](https://www.metacartel.org/)
+- The Ethereum ecosystem needs your talents! Many companies are hiring for product manager roles. If you want to start by contributing to an open source project, get in touch with the [Ethereum Cat Herders](https://gitter.im/ethereum-cat-herders/community?source=orgpage) or [MetaCartel](https://www.metacartel.org/)
 
 **Marketing**
 

docs/enterprise/index.md

@@ -32,6 +32,8 @@ For more in depth information, here are some related articles:
 - [Blockchain Use Cases and Applications by Industry](https://media.consensys.net/enterprise-ethereum-blockchain-use-cases-and-applications-by-industry-3914d1210049)
 - [EY releases zero-knowledge proof blockchain transaction technology to the public domain to advance blockchain privacy standards](https://www.ey.com/en_gl/news/2019/04/ey-releases-zero-knowledge-proof-blockchain-transaction-technology-to-the-public-domain-to-advance-blockchain-privacy-standards)
 - [Introduction to Quorum: Blockchain for the Financial Sector](https://medium.com/blockchain-at-berkeley/introduction-to-quorum-blockchain-for-the-financial-sector-58813f84e88c)
+- [Projects Building on J.P. Morgan’s Quorum Blockchain](https://link.medium.com/7tAmZtjsg6)
+
 
 ## Enterprise Applications Live on Mainnet{#enterprise-live-on-mainnet}
 
@@ -96,6 +98,8 @@ The following projects provide blockchain services for enterprises grade systems
 - [Autonity](https://www.clearmatics.com/about/) _protocol suite that implements p2p protocols and provides client software and infrastructure_
 - [Chainstack](https://chainstack.com/) _multi-cloud and multi-protocol Platform as a Service empowering businesses to rapidly build, deploy, and manage decentralized networks and services_
 - [Baseline](https://www.baseline-protocol.org/) _an open source initiative that combines advances in cryptography, messaging, and blockchain to deliver secure and private business processes at low cost via the public Ethereum Mainnet_
+- [Quorum](https://github.com/jpmorganchase/quorum) _an Ethereum-based open source enterprise blockchain platform with advanced enterprise grade features enabling privacy, permissioning and performance_
+- [Official Quorum documentation](http://docs.goquorum.com/en/latest)
 
 ## Enterprise Features {#enterprise-features}
 
@@ -104,15 +108,15 @@ Public and private Ethereum networks might need specific features required by ne
 ### Permissioning {#permissioning}
 
 - [PegaSys Permissioning Contracts](https://github.com/PegaSysEng/permissioning-smart-contracts)
-- [Quorum Permissioning solution](https://github.com/jpmorganchase/quorum/wiki/Security)
+- [Quorum Permissioning solution](http://docs.goquorum.com/en/latest/Permissioning/Overview/)
 
 ### Privacy {#privacy}
 
 - [Ernst & Young's ‘Nightfall'](https://github.com/EYBlockchain/nightfall)
   _More information [here](https://bravenewcoin.com/insights/ernst-and-young-rolls-out-'nightfall-to-enable-private-transactions-on)_
 - [PegaSys' Orion](https://docs.pantheon.pegasys.tech/en/stable/Concepts/Privacy/Privacy-Overview/)
   _More information [here](https://pegasys.tech/privacy-in-pantheon-how-it-works-and-why-your-enterprise-should-care/)_
-- [Quorum's Tessera](https://docs.goquorum.com/en/latest/Privacy/Tessera/Tessera/) _More information [here](https://github.com/jpmorganchase/tessera/wiki/How-Tessera-works)_
+- [Quorum's Tessera](https://docs.goquorum.com/en/latest/Privacy/Tessera/Tessera/) _More information [here](http://docs.goquorum.com/en/latest/Privacy/Lifecycle-of-a-private-transaction/)_
 
 ### Security {#security}
 

docs/foundation/index.md

@@ -25,9 +25,9 @@ The EF is not a company, or even a traditional non-profit. Their role is not to
 
 ### Ecosystem Support Program
 
-The [Ecosystem Support Program](https://ecosystem.support/) exists to provide both financial and non-financial support to projects and entities within the greater Ethereum community, in order to accelerate the growth of the ecosystem. The Ecosystem Support Program is an expansion of the original Ethereum Grants Program which mainly focused on financial support.
+The [Ecosystem Support Program](https://esp.ethereum.foundation/) exists to provide both financial and non-financial support to projects and entities within the greater Ethereum community, in order to accelerate the growth of the ecosystem. The Ecosystem Support Program is an expansion of the original Ethereum Grants Program which mainly focused on financial support.
 
-Learn more about the Ecosystem Support Program, past grant recipients, and the grant application process at [ecosystem.support](https://ecosystem.support/). You can also view the [Ecosystem Support Program Blog](https://blog.ethereum.org/category/ecosystem-support-program/) or follow [@EF_ESP](https://twitter.com/EF_ESP) for their latest news and announcements.
+Learn more about the Ecosystem Support Program, past grant recipients, and the grant application process at [esp.ethereum.foundation](https://esp.ethereum.foundation/). You can also view the [Ecosystem Support Program Blog](https://blog.ethereum.org/category/ecosystem-support-program/) or follow [@EF_ESP](https://twitter.com/EF_ESP) for their latest news and announcements.
 
 ### Devcon
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-dot-org-website",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "Ethereum.org website",
   "scripts": {
     "dev": "vuepress dev docs",