master

packages/celotool/src/e2e-tests/governance_tests.ts

@@ -297,7 +297,10 @@ describe('governance tests', () => {
       await waitToFinishSyncing(groupWeb3)
       const groupKit = newKitFromWeb3(groupWeb3)
       const group: string = (await groupWeb3.eth.getAccounts())[0]
-      await (await groupKit.contracts.getElection()).activate(group)
+      const txos = await (await groupKit.contracts.getElection()).activate(group)
+      for (const txo of txos) {
+        await txo.sendAndWaitForReceipt({ from: group })
+      }
 
       validators = await groupKit._web3Contracts.getValidators()
       const membersToSwap = [validatorAccounts[0], validatorAccounts[1]]
@@ -603,6 +606,7 @@ describe('governance tests', () => {
           const activeVotes = new BigNumber(
             await election.methods.getActiveVotes().call({}, blockNumber - 1)
           )
+          assert.isFalse(activeVotes.isZero())
           const targetVotingYield = new BigNumber(
             (await epochRewards.methods.getTargetVotingYieldParameters().call({}, blockNumber))[0]
           )
@@ -644,17 +648,26 @@ describe('governance tests', () => {
         const previousTarget = new BigNumber(
           (await epochRewards.methods.getTargetVotingYieldParameters().call({}, blockNumber - 1))[0]
         )
-        const difference = currentTarget.minus(previousTarget)
-
-        // Assert equal to 9 decimal places due to rounding errors.
-        assert.equal(
-          fromFixed(difference)
-            .dp(9)
-            .toFixed(),
-          fromFixed(expected)
-            .dp(9)
-            .toFixed()
+        const max = new BigNumber(
+          (await epochRewards.methods.getTargetVotingYieldParameters().call({}, blockNumber))[1]
         )
+        const expectedTarget = previousTarget.plus(expected)
+        if (expectedTarget.isGreaterThanOrEqualTo(max)) {
+          assert.equal(currentTarget.toFixed(), max.toFixed())
+        } else if (expectedTarget.isLessThanOrEqualTo(0)) {
+          assert.isTrue(currentTarget.isZero())
+        } else {
+          const difference = currentTarget.minus(previousTarget)
+          // Assert equal to 9 decimal places due to rounding errors.
+          assert.equal(
+            fromFixed(difference)
+              .dp(9)
+              .toFixed(),
+            fromFixed(expected)
+              .dp(9)
+              .toFixed()
+          )
+        }
       }
 
       const assertTargetVotingYieldUnchanged = async (blockNumber: number) => {

packages/celotool/src/e2e-tests/sync_tests.ts

@@ -71,7 +71,7 @@ describe('sync tests', function(this: any) {
         // Give the validators time to create more blocks.
         await sleep(20)
         const validatingLatestBlock = await validatingWeb3.eth.getBlockNumber()
-        await sleep(1)
+        await sleep(10)
         const syncLatestBlock = await syncWeb3.eth.getBlockNumber()
         assert.isAbove(validatingLatestBlock, 1)
         // Assert that the validator is still producing blocks.

packages/cli/src/commands/account/show.ts

@@ -1,5 +1,5 @@
 import { BaseCommand } from '../../base'
-import { printValueMap } from '../../utils/cli'
+import { printValueMapRecursive } from '../../utils/cli'
 import { Args } from '../../utils/command'
 
 export default class Show extends BaseCommand {
@@ -18,6 +18,6 @@ export default class Show extends BaseCommand {
     const { args } = this.parse(Show)
 
     const accounts = await this.kit.contracts.getAccounts()
-    printValueMap(await accounts.getAccountSummary(args.address))
+    printValueMapRecursive(await accounts.getAccountSummary(args.address))
   }
 }

packages/cli/src/commands/election/show.ts

@@ -24,7 +24,10 @@ export default class ElectionShow extends BaseCommand {
     Args.address('address', { description: "Voter or Validator Groups's address" }),
   ]
 
-  static examples = ['show 0x97f7333c51897469E8D98E7af8653aAb468050a3']
+  static examples = [
+    'show 0x97f7333c51897469E8D98E7af8653aAb468050a3 --voter',
+    'show 0x97f7333c51897469E8D98E7af8653aAb468050a3 --group',
+  ]
 
   async run() {
     const res = this.parse(ElectionShow)
@@ -43,6 +46,8 @@ export default class ElectionShow extends BaseCommand {
         .runChecks()
       const voter = await election.getVoter(address)
       printValueMapRecursive(voter)
+    } else {
+      throw Error('Must select --voter or --group')
     }
   }
 }

packages/cli/src/commands/election/vote.ts

@@ -23,15 +23,17 @@ export default class ElectionVote extends BaseCommand {
   ]
   async run() {
     const res = this.parse(ElectionVote)
+    const value = new BigNumber(res.flags.value)
 
     this.kit.defaultAccount = res.flags.from
     await newCheckBuilder(this, res.flags.from)
       .isSignerOrAccount()
       .isValidatorGroup(res.flags.for)
+      .hasEnoughNonvotingLockedGold(value)
       .runChecks()
 
     const election = await this.kit.contracts.getElection()
-    const tx = await election.vote(res.flags.for, new BigNumber(res.flags.value))
+    const tx = await election.vote(res.flags.for, value)
     await displaySendTx('vote', tx)
   }
 }

packages/cli/src/commands/lockedgold/unlock.ts

@@ -1,4 +1,5 @@
 import { flags } from '@oclif/command'
+import BigNumber from 'bignumber.js'
 import { BaseCommand } from '../../base'
 import { newCheckBuilder } from '../../utils/checks'
 import { displaySendTx } from '../../utils/cli'
@@ -23,11 +24,13 @@ export default class Unlock extends BaseCommand {
     const res = this.parse(Unlock)
     this.kit.defaultAccount = res.flags.from
     const lockedgold = await this.kit.contracts.getLockedGold()
+    const value = new BigNumber(res.flags.value)
 
-    await newCheckBuilder(this)
+    await newCheckBuilder(this, res.flags.from)
       .isAccount(res.flags.from)
+      .hasEnoughNonvotingLockedGold(value)
       .runChecks()
 
-    await displaySendTx('unlock', lockedgold.unlock(res.flags.value))
+    await displaySendTx('unlock', lockedgold.unlock(value))
   }
 }

packages/cli/src/utils/checks.ts

@@ -55,10 +55,18 @@ class CheckBuilder {
     }
   }
 
-  withLockedGold<A>(f: (lockedGold: LockedGoldWrapper) => A): () => Promise<Resolve<A>> {
+  withLockedGold<A>(
+    f: (lockedGold: LockedGoldWrapper, signer: Address, account: Address) => A
+  ): () => Promise<Resolve<A>> {
     return async () => {
       const lockedGold = await this.kit.contracts.getLockedGold()
-      return f(lockedGold) as Resolve<A>
+      const validators = await this.kit.contracts.getValidators()
+      if (this.signer) {
+        const account = await validators.signerToAccount(this.signer)
+        return f(lockedGold, this.signer, account) as Resolve<A>
+      } else {
+        return f(lockedGold, '', '') as Resolve<A>
+      }
     }
   }
 
@@ -152,6 +160,26 @@ class CheckBuilder {
     )
   }
 
+  hasEnoughLockedGold = (value: BigNumber) => {
+    const valueInEth = this.kit.web3.utils.fromWei(value.toFixed(), 'ether')
+    return this.addCheck(
+      `Account has at least ${valueInEth} Locked Gold`,
+      this.withLockedGold(async (l, _signer, account) =>
+        value.isLessThanOrEqualTo(await l.getAccountTotalLockedGold(account))
+      )
+    )
+  }
+
+  hasEnoughNonvotingLockedGold = (value: BigNumber) => {
+    const valueInEth = this.kit.web3.utils.fromWei(value.toFixed(), 'ether')
+    return this.addCheck(
+      `Account has at least ${valueInEth} non-voting Locked Gold`,
+      this.withLockedGold(async (l, _signer, account) =>
+        value.isLessThanOrEqualTo(await l.getAccountNonvotingLockedGold(account))
+      )
+    )
+  }
+
   async runChecks() {
     console.log(`Running Checks:`)
     let allPassed = true

packages/contractkit/src/wrappers/Election.ts

@@ -137,14 +137,14 @@ export class ElectionWrapper extends BaseWrapper<Election> {
    */
   async hasPendingVotes(account: Address): Promise<boolean> {
     const groups: string[] = await this.contract.methods.getGroupsVotedForByAccount(account).call()
-    const isNotPending = await Promise.all(
+    const isPending = await Promise.all(
       groups.map(async (g) =>
         toBigNumber(
-          await this.contract.methods.getPendingVotesForGroupByAccount(account, g).call()
-        ).isZero()
+          await this.contract.methods.getPendingVotesForGroupByAccount(g, account).call()
+        ).isGreaterThan(0)
       )
     )
-    return !isNotPending.every((a: boolean) => a)
+    return isPending.some((a: boolean) => a)
   }
 
   async hasActivatablePendingVotes(account: Address): Promise<boolean> {

packages/docs/command-line-interface/election.md

@@ -100,8 +100,9 @@ OPTIONS
   --group  Show information about a group running in Validator elections
   --voter  Show information about an account voting in Validator elections
 
-EXAMPLE
-  show 0x97f7333c51897469E8D98E7af8653aAb468050a3
+EXAMPLES
+  show 0x97f7333c51897469E8D98E7af8653aAb468050a3 --voter
+  show 0x97f7333c51897469E8D98E7af8653aAb468050a3 --group
 ```
 
 _See code: [packages/cli/src/commands/election/show.ts](https://github.com/celo-org/celo-monorepo/tree/master/packages/cli/src/commands/election/show.ts)_

packages/docs/command-line-interface/introduction.md

@@ -20,38 +20,6 @@ npm install -g @celo/celocli
 We are currently deploying the CLI with only Node v10.x LTS support. If you are running a different version of Node, consider using [NVM](https://github.com/nvm-sh/nvm#installation-and-update) to manage your node versions. e.g. with: `nvm install 10 && nvm use 10`
 {% endhint %}
 
-### Docker Image
-
-Additionally, if don't have NPM or are having trouble installing the Celo CLI with your version of node, you can use a docker image that runs the Celo Blockchain client in full sync mode which includes the Celo CLI.
-
-```bash
-docker pull us.gcr.io/celo-testnet/celocli:master
-```
-
-For more details on configuring this container, see the [Running a Full Node](../getting-started/running-a-full-node.md) section. You can run the container with the following command.
-
-```bash
-docker run --name celo_cli_container -it -p 8545:8545 us.gcr.io/celo-testnet/celocli:master -v
-```
-
-With additional arguments to the image, it can also be run in ultralight sync mode.
-
-```bash
-docker run --name celo_cli_container -p 8545:8545 --entrypoint=/celo/start_geth.sh us.gcr.io/celo-testnet/celocli:master "/usr/local/bin/geth" "alfajores" "ultralight"
-```
-
-An interactive shell where the Celo CLI is available can be obtained via the following command. All of the subsequent documentation should be appropriate from this shell.
-
-```bash
-docker exec -it celo_cli_container /bin/sh
-```
-
-Make sure to kill the container when you are done.
-
-```bash
-docker kill celo_cli_container
-```
-
 ### **Prerequisites**
 
 - **You have a full node running.** See the [Running a Full Node](running-a-full-node.md) instructions for more details on running a full node.