Alfajores deploy October 24

.codecov.yml

@@ -12,6 +12,9 @@ coverage:
         flags: protocol
         threshold: 5%
         target: 90%
+        if_no_uploads: error
+        if_not_found: success
+        if_ci_failed: error
     patch:
       default: off
 

.env

@@ -20,12 +20,12 @@ BLOCKSCOUT_DB_SUFFIX=
 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="7fbd6f3574f1c1c1e657c152fc63fb771adab3af"
+GETH_NODE_DOCKER_IMAGE_TAG="ba213df07070433970d9b2cf75bae1d146cbfeda"
 
 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="7fbd6f3574f1c1c1e657c152fc63fb771adab3af"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="ba213df07070433970d9b2cf75bae1d146cbfeda"
 
 CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
 CELOTOOL_DOCKER_IMAGE_TAG="celotool-dfdc3e8b26e98aa294b27e2b5621c184488a10db"

.env.alfajores

@@ -20,12 +20,12 @@ BLOCKSCOUT_SUBNETWORK_NAME="Alfajores"
 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="027dba2e4584936cc5a8e8993e4e27d28d5247b8"
+GETH_NODE_DOCKER_IMAGE_TAG="9575a01c12438e1adc6bb610c891cb5066aaa7aa"
 
 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="027dba2e4584936cc5a8e8993e4e27d28d5247b8"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="9575a01c12438e1adc6bb610c891cb5066aaa7aa"
 
 CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
 CELOTOOL_DOCKER_IMAGE_TAG="celotool-552b1accf90404fdcd886670d150af0a5cae116f"
@@ -40,7 +40,7 @@ GETH_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet-production/geth-expor
 GETH_EXPORTER_DOCKER_IMAGE_TAG="6df683de7ae30d3fbca384abb14599d0e8130d35"
 
 # Genesis Vars
-NETWORK_ID=44784
+NETWORK_ID=44785
 CONSENSUS_TYPE="istanbul"
 BLOCK_TIME=5
 EPOCH=720   // 1 hour

.env.alfajoresstaging

@@ -24,12 +24,12 @@ BLOCKSCOUT_SUBNETWORK_NAME="Alfajores Staging"
 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="ae27fd3aa8b0de7bbf7926aecd34690feef7d069"
+GETH_NODE_DOCKER_IMAGE_TAG="9575a01c12438e1adc6bb610c891cb5066aaa7aa"
 
 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="ae27fd3aa8b0de7bbf7926aecd34690feef7d069"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="9575a01c12438e1adc6bb610c891cb5066aaa7aa"
 
 CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
 CELOTOOL_DOCKER_IMAGE_TAG="celotool-552b1accf90404fdcd886670d150af0a5cae116f"
@@ -47,8 +47,8 @@ GETH_EXPORTER_DOCKER_IMAGE_TAG="6df683de7ae30d3fbca384abb14599d0e8130d35"
 NETWORK_ID=1101
 CONSENSUS_TYPE="istanbul"
 BLOCK_TIME=5
-# Minimum epoch length is 1 day
-EPOCH=17280
+# Minimum epoch length is 10 minutes
+EPOCH=120
 ISTANBUL_REQUEST_TIMEOUT_MS=10000
 
 # "og" -> our original 4 tx nodes, "${n}" -> for deriving n tx nodes from the MNEMONIC

.env.integration

@@ -14,27 +14,27 @@ BLOCKSCOUT_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/blockscout"
 BLOCKSCOUT_WEB_DOCKER_IMAGE_TAG="web-f6c3e0888d1d0ef72dc8bf870808702b7fd13730"
 BLOCKSCOUT_INDEXER_DOCKER_IMAGE_TAG="indexer-f6c3e0888d1d0ef72dc8bf870808702b7fd13730"
 BLOCKSCOUT_WEB_REPLICAS=3
-BLOCKSCOUT_DB_SUFFIX="24"
+BLOCKSCOUT_DB_SUFFIX="25"
 BLOCKSCOUT_SUBNETWORK_NAME="Integration"
 
 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="640a41fd970e0edbf5f30a90d53660165f5e98bd"
+GETH_NODE_DOCKER_IMAGE_TAG="c1ae452c707f8bee91a9a0bf49193e78e9c8512e"
 
 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="640a41fd970e0edbf5f30a90d53660165f5e98bd"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="c1ae452c707f8bee91a9a0bf49193e78e9c8512e"
 
 CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-CELOTOOL_DOCKER_IMAGE_TAG="celotool-dfdc3e8b26e98aa294b27e2b5621c184488a10db"
+CELOTOOL_DOCKER_IMAGE_TAG="celotool-2cb725c36b69e7ae608875610af080f4f3fa79bd"
 
 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-2cb725c36b69e7ae608875610af080f4f3fa79bd"
 
 ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-5035b241cbcfbd4f261e3d77e1fca8f6dc8edc32"
+ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-2cb725c36b69e7ae608875610af080f4f3fa79bd"
 
 GETH_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet-production/geth-exporter"
 GETH_EXPORTER_DOCKER_IMAGE_TAG="ed7d21bd50592709173368cd697ef73c1774a261"
@@ -53,7 +53,7 @@ TX_NODES=2
 STATIC_IPS_FOR_GETH_NODES=false
 # Whether tx_nodes/validators stateful set should use ssd persistent disks
 GETH_NODES_SSD_DISKS=true
-IN_MEMORY_DISCOVERY_TABLE=false
+IN_MEMORY_DISCOVERY_TABLE=true
 
 # Testnet vars
 GETH_NODES_BACKUP_CRONJOB_ENABLED=true

README-dev.md

@@ -1,5 +1,26 @@
 # README GUIDE FOR CELO DEVELOPERS
 
+## Monorepo inter-package dependencies
+
+Many packages depend on other packages within the monorepo. When this happens, follow these rules:
+
+1.  All packages must use **master version** of sibling packages.
+2.  Exception to (1) are packages that represent a GAE/firebase app which must use the last published version.
+3.  To differentiate published vs unpublished version. Master version (in package.json) must end with suffix `-dev` and should not be published.
+4.  If a developer want to publish a version; then after publishing it needs to set master version to next `-dev` version and change all package.json that require on it.
+
+To check which pakages need amending, you can run (in the root pkg):
+
+    yarn check:packages
+
+A practical example:
+
+- In any given moment, `contractkit/package.json#version` field **must** of the form `x.y.z-dev`
+- If current version of contractkit is: `0.1.6-dev` and we want to publish a new version, we should:
+  - publish version `0.1.6`
+  - change `package.json#version` to `0.1.7-dev`
+  - change in other packages within monorepo that were using `0.1.6-dev` to `0.1.7-dev`
+
 ## How to publish a new npm package
 
 First checkout the alfajores branch.
@@ -13,8 +34,8 @@ Before publishing a new celocli package, test in isolation using Docker. This co
 
 ```
 # To test utils package, change $PWD/packages/cli to $PWD/packages/utils
-# To test contractkit package, change $PWD/packages/contractkit to $PWD/packages/contractkit
-celo-monorepo $ docker run -v $PWD/packages/cli:/tmp/npm_package -it --entrypoint bash node:8
+# To test contractkit package, change $PWD/packages/cli to $PWD/packages/contractkit
+celo-monorepo $ docker run -v $PWD/packages/cli:/tmp/npm_package -it --entrypoint bash node:10
 root@e0d56700584f:/# mkdir /tmp/tmp1 && cd /tmp/tmp1
 root@e0d56700584f:/tmp/tmp1# npm install /tmp/npm_package/
 ```
@@ -27,7 +48,7 @@ celo-monorepo/packages/cli $ yarn publish --access=public
 # Increment the version number, after testing, we will push that commit to GitHub
 ```
 
-Let's say the published package version number 0.0.15, verify that it is installable
+Let's say the published package version number 0.0.20, verify that it is installable
 
 ```
 /tmp/tmp1 $ npm install @celo/[email protected]
@@ -43,7 +64,7 @@ Once you publish do some manual tests, for example, after publishing `celocli`
 
 ```
 # Docker for an isolated environment again
-celo-monorepo $ docker run -it --entrypoint bash node:8
+celo-monorepo $ docker run -it --entrypoint bash node:10
 root@e0d56700584f:/# mkdir /tmp/tmp1 && cd /tmp/tmp1
 root@e0d56700584f:/tmp/tmp1# npm install @celo/[email protected]
 /tmp/tmp1# ./node_modules/.bin/celocli

SETUP.md

@@ -55,11 +55,14 @@ Install `nvm` (allows you to manage multiple versions of Node), Node 8 and `yarn
 
 ```bash
 brew install nvm
+
 # follow the instructions from the command above to edit your .bash_profile
 # then restart the terminal
+nvm install 8
 nvm install 10
 nvm alias default 10
 brew install yarn
+npm install -g typescript
 ```
 
 #### Java
@@ -98,6 +101,8 @@ Execute the following (and make sure the lines are in your `~/.bash_profile`):
 ```bash
 export ANDROID_HOME=/usr/local/share/android-sdk
 export ANDROID_NDK=/usr/local/share/android-ndk
+# Optional to speedup java builds
+export GRADLE_OPTS='-Dorg.gradle.daemon=true -Dorg.gradle.parallel=true -Dorg.gradle.jvmargs="-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError"'
 ```
 
 Then install the Android 28 platform:
@@ -112,7 +117,7 @@ sdkmanager 'platforms;android-28'
 
 We use Yarn to build all of the [celo-monorepo] repo.
 
-Install `nvm` (allows you to manage multiple versions of Node), Node 8 and `yarn`:
+Install `nvm` (allows you to manage multiple versions of Node), Node 8, Node 10 and `yarn`:
 
 ```bash
 # Installing Node
@@ -125,12 +130,16 @@ source ~/.bashrc
 
 # Setting up the right version of Nvm
 nvm install 8
-nvm alias default 8
+nvm install 10
+nvm alias default 10
 
 # Installing Yarn - https://yarnpkg.com/en/docs/install#debian-stable
 curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
 echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
 sudo apt-get update && sudo apt-get install yarn
+
+# Install typescript
+npm install -g typescript
 ```
 
 #### Installing OpenJDK 8
@@ -211,9 +220,9 @@ Run the emulator with:
 emulator -avd Nexus_5X_API_28
 ```
 
-#### Optional: Genymotion
+#### Optional: Install Genymotion Emulator Manager
 
-Optionally, as alternative to other emulators you can install Genymotion, a nice emulator manager:
+Optionally, as alternative to other emulators you can install Genymotion
 
 ##### MacOS
 
@@ -254,7 +263,8 @@ Then install packages:
 
 ```bash
 cd celo-monorepo
-yarn
+yarn # install dependencies and run post-install script
+yarn build # build all packages
 ```
 
 > Note that if you do your checkouts with a different method, Yarn will fail if
@@ -296,8 +306,6 @@ To deploy the app to your connected Android device:
 
 ```bash
 cd packages/mobile
-# install packages
-yarn
 # install app and start dev server
 yarn dev
 ```

dockerfiles/attestation-service/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 WORKDIR /celo-monorepo
 
 # ensure yarn.lock is evaluated by kaniko cache diff

dockerfiles/celotool/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 WORKDIR /celo-monorepo
 
 # Needed for gsutil
@@ -23,7 +23,7 @@ COPY packages/protocol/package.json packages/protocol/
 COPY packages/verification-pool-api/package.json packages/verification-pool-api/
 COPY packages/celotool/package.json packages/celotool/
 
-RUN yarn install --frozen-lockfile && yarn cache clean
+RUN yarn install --network-timeout 100000 --frozen-lockfile && yarn cache clean
 
 COPY packages/utils packages/utils/
 COPY packages/typescript packages/typescript/

dockerfiles/circleci/Dockerfile

@@ -16,4 +16,18 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \
   curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - && \
   sudo apt-get update -y && sudo apt-get install google-cloud-sdk -y
 
+RUN sudo wget https://dl.google.com/go/go1.11.5.linux-amd64.tar.gz && \
+  sudo tar xf go1.11.5.linux-amd64.tar.gz -C /usr/local
+
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+ENV PATH="/usr/local/go/bin:/home/circleci/.cargo/bin:${PATH}"
+
+RUN go version
+
+RUN rustup install 1.36.0 && \
+  rustup default 1.36.0
+
+RUN mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
+
 CMD ["/bin/sh"]

dockerfiles/cli/Dockerfile

@@ -34,7 +34,7 @@ ADD https://www.googleapis.com/storage/v1/b/genesis_blocks/o/${celo_env}?alt=med
 ADD https://www.googleapis.com/storage/v1/b/static_nodes/o/${celo_env}?alt=media /celo/static-nodes.json
 
 # Build Celocli
-FROM node:8-alpine as node
+FROM node:10-alpine as node
 
 ARG celo_env
 
@@ -46,10 +46,10 @@ WORKDIR /celo-monorepo/
 RUN npm install @celo/celocli
 
 # Build the combined image
-FROM node:8-alpine as final_image
+FROM node:10-alpine as final_image
 
 ARG network_name="alfajores"
-ARG network_id="44784"
+ARG network_id="44785"
 
 # Without musl-dev, geth will fail with a confusing "No such file or directory" error.
 # bash is required for start_geth.sh
@@ -66,4 +66,4 @@ COPY --from=node /celo-monorepo/node_modules /celo-monorepo/node_modules
 RUN chmod ugo+x /celo/start_geth.sh && ln -s /celo-monorepo/node_modules/.bin/celocli /usr/local/bin/celocli
 
 EXPOSE 8545 8546 30303 30303/udp
-ENTRYPOINT ["/celo/start_geth.sh", "/usr/local/bin/geth", "alfajores", "full", "44784", "/root/.celo", "/celo/genesis.json", "/celo/static-nodes.json"]
+ENTRYPOINT ["/celo/start_geth.sh", "/usr/local/bin/geth", "alfajores", "full", "44785", "/root/.celo", "/celo/genesis.json", "/celo/static-nodes.json"]

dockerfiles/cloudbuild/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 
 RUN apt-get update -y
 RUN apt-get install lsb-release libudev-dev libusb-dev -y --no-install-recommends apt-utils

dockerfiles/transaction-metrics-exporter/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 WORKDIR /celo-monorepo
 
 # Needed for gsutil
@@ -35,4 +35,4 @@ COPY packages/transaction-metrics-exporter packages/transaction-metrics-exporter
 RUN yarn build
 
 WORKDIR /celo-monorepo/packages/transaction-metrics-exporter
-CMD ["node lib/index.js"]
+CMD ["node", "lib/index.js"]

package.json

@@ -21,7 +21,8 @@
     "postinstall": "yarn run lerna run postinstall && patch-package && yarn keys:decrypt",
     "preinstall": "bash scripts/create_key_templates.sh",
     "keys:decrypt": "bash scripts/key_placer.sh decrypt",
-    "keys:encrypt": "bash scripts/key_placer.sh encrypt"
+    "keys:encrypt": "bash scripts/key_placer.sh encrypt",
+    "check:packages": "node ./scripts/check-packages.js"
   },
   "husky": {
     "hooks": {

packages/attestation-service/src/attestation.ts

@@ -1,7 +1,7 @@
 import { attestToIdentifier, SignatureUtils } from '@celo/utils'
+import { retryAsyncWithBackOff } from '@celo/utils/lib/async'
 import express from 'express'
 import { sendSms } from './sms'
-
 function signAttestation(phoneNumber: string, account: string) {
   if (process.env.ATTESTATION_KEY === undefined) {
     console.error('Did not specify ATTESTATION_KEY')
@@ -32,7 +32,7 @@ export async function handleAttestationRequest(req: express.Request, res: expres
   const textMessage = createAttestationTextMessage(attestationCode)
 
   // Send the SMS
-  await sendSms(req.body.phoneNumber, textMessage)
+  await retryAsyncWithBackOff(sendSms, 10, [req.body.phoneNumber, textMessage], 1000)
 
   res.json({ success: true })
 }

packages/attestation-service/src/sms.ts

@@ -46,7 +46,7 @@ function getMatchingNumber(countryCode: string) {
   return nexmoNumbers[0].phoneNumber
 }
 
-export async function sendSms(phoneNumber: string, message: string) {
+export async function sendSms(phoneNumber: string, message: string): Promise<void> {
   const countryCode = phoneUtil.getRegionCodeForNumber(phoneUtil.parse(phoneNumber))
 
   if (!countryCode) {

packages/blockchain-api/.env

@@ -1,7 +1,5 @@
 EXCHANGE_RATES_API=https://api.exchangeratesapi.io
-BLOCKSCOUT_API=https://alfajoresstaging-blockscout.celo-testnet.org/api
-CELO_GOLD_ADDRESS=0x1313e2f3EBef8f0d869EECEb796D55A066eEA863
-CELO_DOLLAR_ADDRESS=0x2df4dd6bd1b26a8503f763506bdb8e7cf165f69e
-FAUCET_ADDRESS=0xF4314cb9046bECe6AA54bb9533155434d0c76909
+BLOCKSCOUT_API=https://integration-blockscout.celo-testnet.org/api
+FAUCET_ADDRESS=0x47e172F6CfB6c7D01C1574fa3E2Be7CC73269D95
 VERIFICATION_REWARDS_ADDRESS=0xb4fdaf5f3cd313654aa357299ada901b1d2dd3b5
-ATTESTATIONS_ADDRESS=0x8b7649116f169d2d2aebb6ea1a77f0baf31f2811
+WEB3_PROVIDER_URL=https://integration-infura.celo-testnet.org/