diff --git a/.circleci/config.yml b/.circleci/config.yml index 1af75a1d6f..4be5b9d19d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -115,6 +115,9 @@ jobs: - run: name: "Linting Solidity" command: yarn run solhint + - run: + name: "Check git hooks run" + command: yarn run check:gitchanges - run: name: "Checking contract storage variables" command: yarn run check:storagevars diff --git a/docs/_Interface_IColonyNetwork.md b/docs/_Interface_IColonyNetwork.md index 3c0b26a2ac..e0faf05078 100644 --- a/docs/_Interface_IColonyNetwork.md +++ b/docs/_Interface_IColonyNetwork.md @@ -937,21 +937,6 @@ Set a new Reputation root hash and starts a new mining cycle. Can only be called |stakers|address[]|Array of users who submitted or backed the hash, being accepted here as the new reputation root hash -### `setReputationRootHash` - -This version of setReputationRootHash is deprecated and will be removed in a future release. It transparently calls the new version if it is called (essentially, removing the `reward` parameter. - - -**Parameters** - -|Name|Type|Description| -|---|---|---| -|newHash|bytes32|The reputation root hash -|newNLeaves|uint256|The updated leaves count value -|stakers|address[]|Array of users who submitted or backed the hash, being accepted here as the new reputation root hash -|reward|uint256|Amount of CLNY to be distributed as reward to miners (not used) - - ### `setTokenLocking` Sets the token locking address. This is only set once, and can't be changed afterwards. diff --git a/lib/colonyToken b/lib/colonyToken index 506d8ac3b3..360406eb61 160000 --- a/lib/colonyToken +++ b/lib/colonyToken @@ -1 +1 @@ -Subproject commit 506d8ac3b36c30e401c908e5a2d4529d8fb6dac0 +Subproject commit 360406eb61f16f38f8016a50e9e8271af0ebd1d0 diff --git a/package.json b/package.json index 98a1e71c00..7851340be8 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "solhint": "solhint ./contracts/**/*.sol", "build:docs": "scripts/docgen.js", "ping:osx": "osascript -e 'display notification \"Ping!\"'", + "check:gitchanges": "./scripts/no-git-changes.sh", "check:storagevars": "./scripts/check-storage.js", "check:recoverymods": "./scripts/check-recovery.js", "check:coverage": "yarn istanbul-combine -d coverage-merged -p detail -r html -r json coverage-*/coverage-final.json && istanbul check-coverage ./coverage-merged/coverage-final.json --statements 99 --branches 94 --functions 99 --lines 99", diff --git a/scripts/no-git-changes.sh b/scripts/no-git-changes.sh new file mode 100755 index 0000000000..5c75d4866a --- /dev/null +++ b/scripts/no-git-changes.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -e +cd "$(dirname "$0")" + +if [[ `git status --porcelain` ]]; then + echo "GIT changes detected! Please always run all pre-commit hooks. `npm run build:docs` should help in most cases" + + git status --verbose --verbose + + exit 1 +fi