jona · jona · Aug 5, 2021 · Aug 28, 2021 · Aug 28, 2021 · Aug 28, 2021
diff --git a/.github/workflows/npmtest.yml b/.github/workflows/npmtest.yml
@@ -20,7 +20,17 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-      - run: yarn install --non-interactive --frozen-lockfile
+      - name: Install packages
+        run: yarn install --non-interactive --frozen-lockfile
         env:
           NODE_AUTH_TOKEN: ${{secrets.npm_token}}
-      - run: yarn test
+      - name: Run tests
+        run: yarn test:coverage
+      - name: Upload coverage report
+        uses: codecov/codecov-action@v2
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./coverage.json
+          flags: unittests
+          name: graphprotocol-contracts
+          fail_ci_if_error: true
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,10 @@
-# Ignore zeppelin contracts
 node_modules/
 
 # Ignore build stuff
 cache/
 build/
 dist/
 
-# Coverage tests
-coverage/
-
 # Hardhat cache
 cached/
 
@@ -20,5 +16,6 @@ bin/
 .DS_Store
 .vscode
 
-# Sliter
+# Coverage and other reports
 /reports
+coverage.json
diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md
@@ -1,12 +1,10 @@
 ## Deploying the Solidity Smart Contracts
-
 ### Running
 
-A CLI in `cli/cli.ts` deploys the contracts to the specified network when used with the `migrate` command.
-
-This script accepts multiple commands that you can print using:
+Deploy functionality exists in `cli/cli.ts`. You can deploy the contracts to the specified network 
+when used with the `migrate` command. This script accepts multiple commands that you can print using:
 
-```
+```bash
 cli/cli.ts --help
 ```
 

diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,88 +1,134 @@
-# Graph Protocol Solidity Smart Contracts
+![License: GPL](https://img.shields.io/badge/license-GPL-blue)
+![Version Badge](https://img.shields.io/badge/version-1.6.0-lightgrey.svg)
+![CI Status](https://github.com/graphprotocol/contracts/actions/workflows/npmtest.yml/badge.svg)
+[![codecov](https://codecov.io/gh/graphprotocol/contracts/branch/dev/graph/badge.svg?token=S8JWGR9SBN)](https://codecov.io/gh/graphprotocol/contracts)
 
-![Version Badge](https://img.shields.io/badge/version-1.0.0-lightgrey.svg)
+# Graph Protocol Contracts
 
-## Contracts
+[The Graph](https://thegraph.com/) is an indexing protocol for querying networks like Ethereum, IPFS, Polygon, and other blockchains. Anyone can build and Publish open APIs, called subgraphs, making data easily accessible.
 
-This repository contains The Graph Protocol solidity contracts. It is based on the
-[PRD outlined here](https://www.notion.so/thegraph/Public-Network-Contracts-PRD-5eb8466aa4b44a1da7f16a28acd6674f),
-There are many other smaller, more detailed PRDs that these contracts implement, that can also be
-found on notion.
+The Graph Protocol Smart Contracts are a set of Solidity contracts that exist on the Ethereum Blockchain. The contracts enable an open and permissionless decentralized network that coordinates [Graph Nodes](https://github.com/graphprotocol/graph-node) to Index any subgraph that is added to the network. Graph Nodes then provide queries to users for those Subgraphs. Users pay for queries with the Graph Token (GRT).
 
-The contracts enable a staking protocol build on top of Ethereum, using The Graph Network Token
-(GRT). The network enables a decentralized network of Graph Nodes
-to index and serve queries for subgraphs.
-[Graph node's repository can be found here](https://github.com/graphprotocol/graph-node).
+The protocol allows Indexers to Stake, Delegators to Delegate, and Curators to Signal on Subgraphs. The Signal informs Indexers which Subgraphs they should index.
 
-The Graph Network enables smart contract development to happen alongside subgraph development.
-It is a new and improved way to develop dapps. It allows developers to move some logic into the
-subgraph for resolving data based on events, or past storage data on Ethereum. Therefore,
-the contracts and the subgraph rely on each other, to show to end users the current data and state
-of The Graph Network.
+You can learn more by heading to [the documentation](https://thegraph.com/docs/about/introduction), or checking out some of the [blog posts on the protocol](https://thegraph.com/blog/the-graph-network-in-depth-part-1).
 
-### Contracts Testing
+# Contracts
+
+The contracts are upgradable, following the [Open Zeppelin Proxy Upgrade Pattern](https://docs.openzeppelin.com/upgrades-plugins/1.x/proxies). Each contract will be explained in brief detail below.
+
+**_Curation_**
+
+> Allows Curators to Signal GRT towards a Subgraph Deployment they want indexed on The Graph. Curators are often Subgraph Developers, but anyone can participate. Curators also receive a portion of the query fees that are earned on the Subgraph. Signaled GRT goes into a bonding curve, which returns a Graph Curation Share (GCS) to the Curator.
+
+**_Graph Name Service (GNS)_**
+
+> Wraps around the Curation contract to provide pooling of Curator Signaled tokens towards a single Subgraph. This allows an owner to deploy a Subgraph, and upgrade their Subgraph to a new version. The upgrade will move all Curator tokens to a new Subgraph Deployment with a new bonding curve.
+
+**_Service Registry_**
+
+> Allows Indexers to tell the network the location of their node. This allows end users to choose a node close to themselves, lowering the latency for queries.
+
+**_Dispute Manager_**
+
+> Provides a way for Indexers to be slashed or incorrect or malicious behaviour. There are two types of disputes: _Query Disputes_ and _Indexing Disputes_.
+
+**_Epoch Manager_**
+
+> Keeps track of protocol Epochs. Epochs are configured to be a certain block length, which is configurable by The Governor.
+
+**_Controller_**
+
+> The Controller is a contract that has a registry of all protocol contract addresses. It also is the owner of all the contracts. The owner of the Controller is The Governor, which makes The Governor the address that can configure the whole protocol. The Governor is [The Graph Council](https://thegraph.com/blog/introducing-the-graph-council).
+
+**_Rewards Manager_**
+
+> Tracks how inflationary GRT rewards should be handed out. It relies on the Curation contract and the Staking contract. Signaled GRT in Curation determine what percentage of inflationary tokens go towards each subgraph. Each Subgraph can have multiple Indexers Staked on it. Thus, the total rewards for the Subgraph are split up for each Indexer based on much they have Staked on that Subgraph.
+
+**_Staking_**
+
+> The Staking contract allows Indexers to Stake on Subgraphs. Indexers Stake by creating Allocations on a Subgraph. It also allows Delegators to Delegate towards an Indexer. The contract also contains the slashing functionality.
+
+**_Graph Token_**
+
+> An ERC-20 token (GRT) that is used as a work token to power the network incentives. The token is inflationary.
+
+# NPM package
+
+The [NPM package](https://www.npmjs.com/package/@graphprotocol/contracts) contains contract interfaces and addresses for the testnet and mainnet. It also contains [typechain](https://github.com/ethereum-ts/TypeChain) generated objects to easily interact with the contracts. This allows for anyone to install the package in their repository and interact with the protocol. It is updated and released whenever a change to the contracts occurs.
+
+```
+yarn add @graphprotocol/contracts
+```
+
+# Contract Addresses
+
+The testnet runs on Rinkeby, while mainnet is on Ethereum Mainnet. The addresses for both of these can be found in `./addresses.json`.
+
+# Local Setup
+
+To setup the contracts locally, checkout the `dev` branch, then run:
+
+```bash
+yarn
+yarn build
+```
+
+# Testing
 
 Testing is done with the following stack:
 
-- Waffle
-- Hardhat
-- Typescript
-- Ethers
+- [Waffle](https://getwaffle.io/)
+- [Hardhat](https://hardhat.org/)
+- [Typescript](https://www.typescriptlang.org/)
+- [Ethers](https://docs.ethers.io/v5/)
 
 To test all files, use `yarn test`. To test a single file run:
-`npx hardhat test test/<FILE_NAME>.ts`.
 
-### Contract addresses
+```bash
+npx hardhat test test/<FILE_NAME>.ts
+```
+
+# Interacting with the contracts
+
+There are three ways to interact with the contracts through this repo:
+
+**Hardhat**
 
-Currently we are running our testnet on Rinkeby. Contract addresses can be found in this repository at
-`./addresses.json`. However, addresses should be obtained from the NPM Package.
+The most straightforward way to interact with the contracts is through the hardhat console. We have extended the hardhat runtime environment to include all of the contracts. This makes it easy to run the console with autocomplete for all contracts and all functions. It is a quick and easy way to read and write to the contracts.
 
-### Deploying Contracts
+```
+# A console to interact with testnet contracts
+npx hardhat console --network rinkeby
+```
 
-In order to run deployments, see `./DEPLOYMENT.md`. We use a custom deployment script, which
-allowed us to completely remove `truffle` as a dependency.
+**Hardhat Tasks**
 
-## Subgraph
+There are hardhat tasks under the `/tasks` folder. Most tasks are for complex queries to get back data from the protocol.
 
-The subgraph repository can be [found here](https://github.com/graphprotocol/graph-network-subgraph).
+**cli**
 
-Great care must be taken to ensure all the code and data the subgraph refers to is in sync with
-the current contracts on the correct network. For tracking all of this, we have an NPM package.
+There is a cli that can be used to read or write to the contracts. It includes scripts to help with deployment.
 
-The addresses
-for the subgraph need to be the most up to date. This includes grabbing the latest ABIs and
-typechain bindings, as well as pointing the addresses in the subgraph manifest to the latest
-addresses. You can find the latest subgraph addresses in `addresses.json`, and they are also
-in the NPM package.
+# Deploying Contracts
 
-Currently the contracts are being tested on Rinkeby. We test on ganache as well. We used to use
-Kovan, but it is somewhat deprecated.
+In order to run deployments, see [`./DEPLOYMENT.md`](./DEPLOYMENT.md).
 
-## NPM package
+# Contributing
 
-The NPM package will be release in versions, and the version will be coordinated to be the same
-version as the contracts and the subgraph. Anyone wanting to tie into the graph network contracts
-or subgraph should install the npm package into their repository, and refer to the same version
-number for the contracts and subgraph.
+Contributions are welcomed and encouraged! You can do so by:
 
-**New development work on the contracts and subgraph will be merged to master. Thus, when developing**
-**on the network, you should not rely on the master code as it might break between the subgraph repo**
-**and the contracts repo. Please use a version that is tagged.**
+- Creating an issue
+- Opening a PR
 
-The NPM package will contain the following files/information:
+If you are opening a PR, it is a good idea to first go to [The Graph Discord](https://discord.com/invite/vtvv7FP) or [The Graph Forum](https://forum.thegraph.com/) and discuss your idea! Discussions on the forum or Discord are another great way to contribute.
 
-- The contracts
-- The ABIs for those contracts
-- The typechain autogenerated functions. These are typescript functions that are created based off
-  the ABIs, and are very useful for their type checking and the fact they are tied to a version
-- The deployed addresses for each network, the date of deployment, and the commit hash.
-- Metadata JSON objects for Graph Account and Subgraph metadata
-  **This is the only place you should grab contract addresses from.**
+# Security Disclosure
 
-We will also release versions for specific releases, such as `@graphprotocol/contracts@beta`.
+If you have found a bug / security issue, please go through the official channel, [The Graph Security Bounties on Immunefi](https://immunefi.com/bounty/thegraph/). Responsible disclosure procedures must be followed to receive bounties.
 
 # Copyright
 
-Copyright &copy; 2020 The Graph Foundation
+Copyright &copy; 2021 The Graph Foundation
 
-Licensed under [MIT license](LICENSE).
+Licensed under [GPL license](LICENSE).
diff --git a/addresses.json b/addresses.json
@@ -134,10 +134,10 @@
       "txHash": "0x7ef90b0477e5c5d05bbd203af7d2bf15224640204e12abb07331df11425d2d00",
       "proxy": true,
       "implementation": {
-        "address": "0x28037b93702335E55fe6319e1C144B8A4d05DAEB",
+        "address": "0x8F0031C8A936e3f78Db1E0670135CCad27E5b689",
         "creationCodeHash": "0x94893fd38fff869e917edd9efecfbec10407d1484572b7dce9455fa88898c310",
         "runtimeCodeHash": "0xd3367702add6bae5bbe1d8048cb34975ca8b53b560603b07694f1679a1418b24",
-        "txHash": "0x2b997e8470285c174732616c9977b13ad99959a7ea83c39d2647675853389f23"
+        "txHash": "0xc0072042ee9b46a6f5b3d3846c6117353d7060e2b4a497c620a361e866d46244"
       }
     },
     "Staking": {

diff --git a/audits/ConsenSysDiligence/2021-05-graph-initial-review.pdf b/audits/ConsenSysDiligence/2021-05-graph-initial-review.pdf
diff --git a/audits/OpenZeppelin/2021-04-graph-addresses-cache-audit.pdf b/audits/OpenZeppelin/2021-04-graph-addresses-cache-audit.pdf
diff --git a/audits/OpenZeppelin/2021-04-graph-governance-upgrade-audit.pdf b/audits/OpenZeppelin/2021-04-graph-governance-upgrade-audit.pdf
diff --git a/audits/OpenZeppelin/2021-04-graph-rewardsmanager-upgrade-audit.pdf b/audits/OpenZeppelin/2021-04-graph-rewardsmanager-upgrade-audit.pdf
diff --git a/audits/OpenZeppelin/2021-04-graph-slashing-upgrade-audit.pdf b/audits/OpenZeppelin/2021-04-graph-slashing-upgrade-audit.pdf
diff --git a/audits/OpenZeppelin/2021-04-graph-staking-bugfix-2-audit.pdf b/audits/OpenZeppelin/2021-04-graph-staking-bugfix-2-audit.pdf
diff --git a/audits/OpenZeppelin/2021-04-graph-staking-bugfix-audit-1.pdf b/audits/OpenZeppelin/2021-04-graph-staking-bugfix-audit-1.pdf
diff --git a/audits/OpenZeppelin/2021-08-graph-gns-audit.pdf b/audits/OpenZeppelin/2021-08-graph-gns-audit.pdf
diff --git a/contracts/base/IMulticall.sol b/contracts/base/IMulticall.sol
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+pragma solidity ^0.7.3;
+pragma experimental ABIEncoderV2;
+
+/**
+ * @title Multicall interface
+ * @notice Enables calling multiple methods in a single call to the contract
+ */
+interface IMulticall {
+    /**
+     * @notice Call multiple functions in the current contract and return the data from all of them if they all succeed
+     * @param data The encoded function data for each of the calls to make to this contract
+     * @return results The results from each of the calls passed in via data
+     */
+    function multicall(bytes[] calldata data) external returns (bytes[] memory results);
+}
diff --git a/contracts/base/Multicall.sol b/contracts/base/Multicall.sol
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+pragma solidity ^0.7.3;
+pragma experimental ABIEncoderV2;
+
+import "./IMulticall.sol";
+
+// Inspired by https://github.com/Uniswap/uniswap-v3-periphery/blob/main/contracts/base/Multicall.sol
+// Note: Removed payable from the multicall
+
+/**
+ * @title Multicall
+ * @notice Enables calling multiple methods in a single call to the contract
+ */
+abstract contract Multicall is IMulticall {
+    /// @inheritdoc IMulticall
+    function multicall(bytes[] calldata data) external override returns (bytes[] memory results) {
+        results = new bytes[](data.length);
+        for (uint256 i = 0; i < data.length; i++) {
+            (bool success, bytes memory result) = address(this).delegatecall(data[i]);
+
+            if (!success) {
+                // Next 5 lines from https://ethereum.stackexchange.com/a/83577
+                if (result.length < 68) revert();
+                assembly {
+                    result := add(result, 0x04)
+                }
+                revert(abi.decode(result, (string)));
+            }
+
+            results[i] = result;
+        }
+    }
+}