Merge branch 'master' into aaronmgdr/low-home

* master: (27 commits)
  Experience Brand Kit 1.0 (#1948)
  Adjust reference to the rewards app (#2065)
  [Wallet] Compatibility with exchange rate in string format (#2060)
  Fix Typo in CI config (#2056)
  Fix additional attestations instructions (#2057)
  Allow a specified address to disable/enable rewards distribution (#1828)
  Aaronmgdr/leaderboard patch (#2055)
  Move attestation service instructions to main page (#2051)
  Point To Updated Join Celo Video (#2052)
  Fix minor issue withe the ordering of instructions
  changes to docs related to discovery (#2025)
  [Docs] Fix typos in Running a Validator docs (#2045)
  Add node flag to celocli to set the target node for a single command (#2020)
  Fix broken links and spruce up CLI docs for accounts command (#2027)
  Prevent clipping of arrow component (#2036)
  Allocates an initial balance to the attestation bot (#2019)
  gold and dollar flags are required for faucet script (#1943)
  Clean seed words text area when returns from empty wallet view (#1904)
  Update validator script (#2026)
  Docs: PoS, metadata, gateway fee plus cleanup (#2022)
  ...

.circleci/config.yml

@@ -173,7 +173,7 @@ jobs:
             HOMEBREW_NO_AUTO_UPDATE=1 brew tap homebrew/cask-versions
             HOMEBREW_NO_AUTO_UPDATE=1 brew cask install homebrew/cask-versions/adoptopenjdk8
       - run:
-          name: Creace Android Virtual Device (AVD)
+          name: Create Android Virtual Device (AVD)
           command: |
             avdmanager create avd -n Nexus_5X_API_28_x86 -k "system-images;android-26;google_apis;x86" -g google_apis -d "Nexus 5"
             # Copy device configuarion, adv for some reason doesn't

.env

@@ -12,7 +12,7 @@ CLUSTER_DOMAIN_NAME="celo-networks-dev"
 TESTNET_PROJECT_NAME="celo-testnet"
 
 BLOCKSCOUT_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/blockscout"
-BLOCKSCOUT_DOCKER_IMAGE_TAG="909682b7435fc3e05849211d96fb1dfbf76306f2"
+BLOCKSCOUT_DOCKER_IMAGE_TAG="d7569f6951deffb47cc2730b1ba1355eb02f6f17"
 BLOCKSCOUT_WEB_REPLICAS=3
 BLOCKSCOUT_DB_SUFFIX=
 
@@ -28,7 +28,7 @@ GETH_NODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/geth"
 # `geth $ git show | head -n 1`
 GETH_NODE_DOCKER_IMAGE_TAG="master"
 
-GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/geth-all"
+GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/geth-all"
 # When upgrading change this to latest commit hash from the master of the geth repo
 # `geth $ git show | head -n 1`
 GETH_BOOTNODE_DOCKER_IMAGE_TAG="master"
@@ -47,10 +47,10 @@ ORACLE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/oracle"
 ORACLE_DOCKER_IMAGE_TAG="default"
 
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-d3d165a7db548d175cd703c86c20c1657c04368d"
+TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-d405b99872097291c8e07d2445559588547938b0"
 
 ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/celo-monorepo"
-ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-59ba27b82a16ca8cc8f79e43ee829b9da41940f2"
+ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-5ee799c0a726a44113cc0a9b26932531019a07a4"
 
 GETH_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet-production/geth-exporter"
 GETH_EXPORTER_DOCKER_IMAGE_TAG="ed7d21bd50592709173368cd697ef73c1774a261"

.env.integration

@@ -11,7 +11,7 @@ CLUSTER_DOMAIN_NAME="celo-testnet"
 TESTNET_PROJECT_NAME="celo-testnet"
 
 BLOCKSCOUT_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/blockscout"
-BLOCKSCOUT_DOCKER_IMAGE_TAG="909682b7435fc3e05849211d96fb1dfbf76306f2"
+BLOCKSCOUT_DOCKER_IMAGE_TAG="d7569f6951deffb47cc2730b1ba1355eb02f6f17"
 BLOCKSCOUT_WEB_REPLICAS=3
 BLOCKSCOUT_DB_SUFFIX="29"
 BLOCKSCOUT_SUBNETWORK_NAME="Integration"
@@ -26,12 +26,12 @@ FAUCET_GENESIS_ACCOUNTS=2
 GETH_NODE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/geth"
 # When upgrading change this to latest commit hash from the master of the geth repo
 # `geth $ git show | head -n 1`
-GETH_NODE_DOCKER_IMAGE_TAG="09a217ff58a95214cbc5189c933359707f4fdaf2"
+GETH_NODE_DOCKER_IMAGE_TAG="36fdb3c48abf01e0d0e32f02636c137797eb1e08"
 
 GETH_BOOTNODE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/geth-all"
 # When upgrading change this to latest commit hash from the master of the geth repo
 # `geth $ git show | head -n 1`
-GETH_BOOTNODE_DOCKER_IMAGE_TAG="09a217ff58a95214cbc5189c933359707f4fdaf2"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="36fdb3c48abf01e0d0e32f02636c137797eb1e08"
 
 CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
 CELOTOOL_DOCKER_IMAGE_TAG="celotool-5bea6d30cbe6aa4272b32a4d2cfed5567f422ea9"
@@ -47,10 +47,10 @@ ORACLE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/oracle"
 ORACLE_DOCKER_IMAGE_TAG="default"
 
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-5bea6d30cbe6aa4272b32a4d2cfed5567f422ea9"
+TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-d405b99872097291c8e07d2445559588547938b0"
 
 ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="us.gcr.io/celo-testnet/celo-monorepo"
-ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-c8e3392aa2ca44ff83b4035700ece5fd12ed2b84"
+ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-5ee799c0a726a44113cc0a9b26932531019a07a4"
 
 GETH_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet-production/geth-exporter"
 GETH_EXPORTER_DOCKER_IMAGE_TAG="ed7d21bd50592709173368cd697ef73c1774a261"

packages/attestation-service/package.json

@@ -27,7 +27,7 @@
     "lint": "tslint -c tslint.json --project ."
   },
   "dependencies": {
-    "@celo/contractkit": "0.2.3-dev",
+    "@celo/contractkit": "0.2.5-dev",
     "@celo/utils": "^0.1.0",
     "bignumber.js": "^7.2.0",
     "body-parser": "1.19.0",

packages/celotool/README.md

@@ -68,7 +68,7 @@ Run this command:
 ### How to Faucet an Account
 
 Run this command:
-`celotooljs account faucet --celo-env <integration-or-your-testnet> --account <account-address>`
+`celotooljs account faucet --celo-env <integration-or-your-testnet> --account <account-address> --gold 10 --dollar 10`
 
 ### How to Setup a Local Celo Blockchain Node
 

packages/celotool/package.json

@@ -9,7 +9,7 @@
     "@celo/verification-pool-api": "^1.0.0",
     "@celo/utils": "^0.1.0",
     "@celo/walletkit": "^0.0.14",
-    "@celo/contractkit": "0.2.3-dev",
+    "@celo/contractkit": "0.2.5-dev",
     "@google-cloud/monitoring": "0.7.1",
     "@google-cloud/pubsub": "^0.28.1",
     "@google-cloud/storage": "^2.4.3",

packages/celotool/src/cmds/account/faucet.ts

@@ -14,7 +14,7 @@ export const describe = 'command for fauceting an address with gold and/or dolla
 interface FaucetArgv extends AccountArgv {
   account: string
   gold: number
-  dollars: number
+  dollar: number
 }
 
 export const builder = (argv: yargs.Argv) => {
@@ -30,15 +30,15 @@ export const builder = (argv: yargs.Argv) => {
         return address
       },
     })
-    .option('dollars', {
+    .option('dollar', {
       type: 'number',
       description: 'Number of dollars to faucet',
-      default: 0,
+      demand: 'Please specify dollars to faucet',
     })
     .option('gold', {
       type: 'number',
       description: 'Amount of gold to faucet',
-      default: 0,
+      demand: 'Please specify gold to faucet',
     })
 }
 
@@ -59,10 +59,8 @@ export const handler = async (argv: FaucetArgv) => {
       kit.contracts.getReserve(),
     ])
     const goldAmount = await convertToContractDecimals(argv.gold, goldToken)
-    const stableTokenAmount = await convertToContractDecimals(argv.dollars, stableToken)
-    console.log(
-      `Fauceting ${goldAmount.toFixed()} Gold and ${stableTokenAmount.toFixed()} StableToken to ${address}`
-    )
+    const stableTokenAmount = await convertToContractDecimals(argv.dollar, stableToken)
+    console.log(`Fauceting ${argv.gold} Gold and ${argv.dollar} StableToken to ${address}`)
     if (!goldAmount.isZero()) {
       if (await reserve.isSpender(account)) {
         await reserve.transferGold(address, goldAmount.toFixed()).sendAndWaitForReceipt()

packages/celotool/src/cmds/account/verify.ts

@@ -29,7 +29,7 @@ export const builder = (argv: yargs.Argv) => {
   return argv
     .option('phone', {
       type: 'string',
-      description: 'Phone number to attest to,',
+      description: `Phone number to attest to. Should be an E.164 number matching formatted like +451234567890.`,
       demand: 'Please specify phone number to attest to',
     })
     .option('num', {

packages/celotool/src/cmds/deploy/upgrade/all.ts

@@ -0,0 +1,43 @@
+import { sleep } from '@celo/utils/lib/async'
+import yargs from 'yargs'
+import { UpgradeArgv } from '../../deploy/upgrade'
+import { handler as contractsHandler } from '../initial/contracts'
+import { handler as attestationServiceHandler } from './attestation-service'
+import { handler as blockscoutHandler } from './blockscout'
+import { handler as ethstatsHandler } from './ethstats'
+import { handler as testnetHandler } from './testnet'
+
+export const command = 'all'
+
+export const describe = 'upgrades a typical deploy'
+
+type TestnetArgv = UpgradeArgv & {
+  reset: boolean
+}
+
+export const builder = (argv: yargs.Argv) => {
+  return argv.option('reset', {
+    describe: 'indicates a reset',
+    default: false,
+    type: 'boolean',
+  })
+}
+
+export const handler = async (argv: TestnetArgv) => {
+  console.info('Deploy the testnet')
+  await testnetHandler(argv)
+  console.info('Deploy ethstats')
+  await ethstatsHandler(argv)
+  console.info('Deploy blockscout')
+  await blockscoutHandler(argv)
+
+  if (argv.reset) {
+    console.info('Sleeping for 5 minutes to let pods come up')
+    await sleep(300000)
+    console.info('Deploy contracts')
+    await contractsHandler(argv)
+  }
+
+  console.info('Deploy attestation-service')
+  await attestationServiceHandler(argv)
+}