Merge branch 'master' into aaronmgdr/oct-bits

* master: (35 commits) [Wallet] Fix top of emojis cut off in the activity feed (#1243) Adding a contract to store minimum required client version (#1081) Revert "Feature #909 proxy delegatecall (#1152)" (#1241) Use ContractKit to get addresses for Blockchain API (#1175) Feature #909 proxy delegatecall (#1152) Fix Faucet done message (#1217) Updated SETUP.md with new yarn process (#1224) Adding `increaseAllowance` and `decreaseAllowance` methods (#1196) extracting function signatures (#1061) Fix integration hardcode (#1208) Fixing flaky governance test (#1155) Restore CI branch (#1223) [wallet] e2e back to green (#1210) [Wallet] Implement new import wallet flow designs (#1209) [Wallet] Fix disable conditions for butons on Enter Invite screen (#1214) [protocol] Rename infrastructureFraction to proposerFraction (#1174) [ck] Proper promise treatment to avoid UnhandledPromises (#1219) [ck] Transform StableToken parameters from fixidity format (#1218) [wallet]Store encrypted local signing key (#1188) 2019-10-03 alfajores deployment (#1200) ...
celo-org · Oct 8, 2019 · f059a61 · f059a61
2 parents 59e0e4b + 222ab26
commit f059a61
Show file tree

Hide file tree

Showing 188 changed files with 7,136 additions and 2,446 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -328,6 +328,45 @@ jobs:
             mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
             ./ci_test_transfers.sh checkout master
 
+  end-to-end-geth-exit-test:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/app
+      - run:
+          name: Check if the test should run
+          command: |
+            FILES_TO_CHECK="${PWD}/packages/celotool,${PWD}/packages/protocol,${PWD}/.circleci/config.yml"
+            ./scripts/ci_check_if_test_should_run_v2.sh ${FILES_TO_CHECK}
+      - run:
+          name: Setup Go language
+          command: |
+            set -e
+            set -v
+            wget https://dl.google.com/go/go1.11.5.linux-amd64.tar.gz
+            tar xf go1.11.5.linux-amd64.tar.gz -C /tmp
+            ls /tmp/go/bin/go
+            /tmp/go/bin/go version
+      - run:
+          name: Setup Rust language
+          command: |
+            set -e
+            set -v
+            curl https://sh.rustup.rs -sSf | sh -s -- -y
+            export PATH=${PATH}:~/.cargo/bin:/tmp/go/bin
+            rustup install 1.36.0
+            rustup default 1.36.0
+      - run:
+          name: Run test
+          no_output_timeout: 20m
+          command: |
+            set -e
+            export PATH=${PATH}:~/.cargo/bin:/tmp/go/bin
+            go version
+            cd packages/celotool
+            mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
+            ./ci_test_exit.sh checkout master
+
   end-to-end-geth-governance-test:
     <<: *defaults
     # Source: https://circleci.com/docs/2.0/configuration-reference/#resource_class
@@ -532,6 +571,10 @@ workflows:
           requires:
             - lint-checks
             - walletkit-test
+      - end-to-end-geth-exit-test:
+          requires:
+            - lint-checks
+            - walletkit-test
       - end-to-end-geth-governance-test:
           requires:
             - lint-checks

diff --git a/.codecov.yml b/.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
 

diff --git a/.env.alfajores b/.env.alfajores
@@ -14,18 +14,18 @@ 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="6"
+BLOCKSCOUT_DB_SUFFIX="7"
 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="f7095b78003062db9536e1d070772d20a3f81e93"
+GETH_NODE_DOCKER_IMAGE_TAG="027dba2e4584936cc5a8e8993e4e27d28d5247b8"
 
 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="f7095b78003062db9536e1d070772d20a3f81e93"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="027dba2e4584936cc5a8e8993e4e27d28d5247b8"
 
 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=44782
+NETWORK_ID=44784
 CONSENSUS_TYPE="istanbul"
 BLOCK_TIME=5
 EPOCH=720   // 1 hour
@@ -53,8 +53,8 @@ TX_NODES=10
 STATIC_IPS_FOR_GETH_NODES=true
 # Whether tx_nodes/validators stateful set should use ssd persistent disks
 GETH_NODES_SSD_DISKS=true
-
-ADMIN_RPC_ENABLED=false
+IN_MEMORY_DISCOVERY_TABLE=false
+PING_IP_FROM_PACKET=true
 
 # Testnet vars
 GETH_NODES_BACKUP_CRONJOB_ENABLED=true
@@ -63,7 +63,7 @@ CLUSTER_CREATION_FLAGS="--enable-autoscaling --min-nodes 3 --max-nodes 8 --machi
 
 
 GETH_NODE_CPU_REQUEST=400m
-GETH_NODE_MEMORY_REQUEST=4.5G
+GETH_NODE_MEMORY_REQUEST=2.5G
 
 VERIFICATION_POOL_URL="https://us-central1-celo-testnet-production.cloudfunctions.net/handleVerificationRequestalfajores/v0.1/sms/"
 VERIFICATION_REWARDS_URL="https://us-central1-celo-testnet-production.cloudfunctions.net/handleVerificationRequestalfajores/v0.1/rewards/"

diff --git a/README-dev.md b/README-dev.md
@@ -14,7 +14,7 @@ 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
+celo-monorepo $ docker run -v $PWD/packages/cli:/tmp/npm_package -it --entrypoint bash node:10fn
 root@e0d56700584f:/# mkdir /tmp/tmp1 && cd /tmp/tmp1
 root@e0d56700584f:/tmp/tmp1# npm install /tmp/npm_package/
 ```
@@ -43,7 +43,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

diff --git a/SETUP.md b/SETUP.md
@@ -254,7 +254,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 +297,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
 ```

diff --git a/dockerfiles/attestation-service/Dockerfile b/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

diff --git a/dockerfiles/celotool/Dockerfile b/dockerfiles/celotool/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 WORKDIR /celo-monorepo
 
 # Needed for gsutil

diff --git a/dockerfiles/cli/Dockerfile b/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,7 +46,7 @@ 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="44782"

diff --git a/dockerfiles/cloudbuild/Dockerfile b/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

diff --git a/dockerfiles/transaction-metrics-exporter/Dockerfile b/dockerfiles/transaction-metrics-exporter/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 WORKDIR /celo-monorepo
 
 # Needed for gsutil

diff --git a/packages/blockchain-api/.env b/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/
diff --git a/packages/blockchain-api/app.alfajores.yaml b/packages/blockchain-api/app.alfajores.yaml
@@ -5,9 +5,6 @@ env_variables:
   DEPLOY_ENV: "alfajores"
   EXCHANGE_RATES_API: "https://api.exchangeratesapi.io"
   BLOCKSCOUT_API: "https://alfajores-blockscout.celo-testnet.org/api"
-  # Pull addresses from the build artifacts of the network in protocol/build
-  CELO_GOLD_ADDRESS: "0x11CD75C45638Ec9f41C0e8Df78fc756201E48ff2"
-  CELO_DOLLAR_ADDRESS: "0xd4b4fcaCAc9e23225680e89308E0a4C41Dd9C6B4"
   FAUCET_ADDRESS: "0xCEa3eF8e187490A9d85A1849D98412E5D27D1Bb3"
   VERIFICATION_REWARDS_ADDRESS: "0xb4fdaf5f3cd313654aa357299ada901b1d2dd3b5"
-  ATTESTATIONS_ADDRESS: "0x714f2879A4aa985508537f851FeBCfB26D7aF40D"
+  WEB3_PROVIDER_URL: "https://alfajores-infura.celo-testnet.org/"
diff --git a/packages/blockchain-api/app.alfajoresstaging.yaml b/packages/blockchain-api/app.alfajoresstaging.yaml
@@ -5,9 +5,6 @@ env_variables:
   DEPLOY_ENV: "alfajoresstaging"
   EXCHANGE_RATES_API: "https://api.exchangeratesapi.io"
   BLOCKSCOUT_API: "https://alfajoresstaging-blockscout.celo-testnet.org/api"
-  # Pull addresses from the build artifacts of the network in protocol/build
-  CELO_GOLD_ADDRESS: "0x1313e2f3EBef8f0d869EECEb796D55A066eEA863"
-  CELO_DOLLAR_ADDRESS: "0x2dF4dD6Bd1b26a8503F763506bdB8e7cf165f69E"
   FAUCET_ADDRESS: "0xF4314cb9046bECe6AA54bb9533155434d0c76909"
   VERIFICATION_REWARDS_ADDRESS: "0xb4fdaf5f3cd313654aa357299ada901b1d2dd3b5"
-  ATTESTATIONS_ADDRESS: "0x8B7649116f169D2D2aeBB6Ea1A77F0baF31F2811"
+  WEB3_PROVIDER_URL: "https://alfajoresstaging-infura.celo-testnet.org/"
diff --git a/packages/blockchain-api/app.dev.yaml b/packages/blockchain-api/app.dev.yaml
diff --git a/packages/blockchain-api/app.integration.yaml b/packages/blockchain-api/app.integration.yaml
@@ -5,9 +5,6 @@ env_variables:
   DEPLOY_ENV: "integration"
   EXCHANGE_RATES_API: "https://api.exchangeratesapi.io"
   BLOCKSCOUT_API: "https://integration-blockscout.celo-testnet.org/api"
-  # Pull addresses from the build artifacts of the network in protocol/build
-  CELO_GOLD_ADDRESS: "0x9102eCD93ac8D66bAc3D397BF52bc57Ee34Bcb87"
-  CELO_DOLLAR_ADDRESS: "0x47736AB66b892b0FCCb5c7d69B879C6141F6E80c"
   FAUCET_ADDRESS: "0x47e172F6CfB6c7D01C1574fa3E2Be7CC73269D95"
   VERIFICATION_REWARDS_ADDRESS: "0xb4fdaf5f3cd313654aa357299ada901b1d2dd3b5"
-  ATTESTATIONS_ADDRESS: "0xD2C0894D551D4C810Dc5CB55081c0b7BE965A118"
+  WEB3_PROVIDER_URL: "https://integration-infura.celo-testnet.org/"
diff --git a/packages/blockchain-api/app.pilot.yaml b/packages/blockchain-api/app.pilot.yaml
@@ -5,9 +5,6 @@ env_variables:
   DEPLOY_ENV: "pilot"
   EXCHANGE_RATES_API: "https://api.exchangeratesapi.io"
   BLOCKSCOUT_API: "https://pilot-blockscout.celo-testnet.org/api"
-  # Pull addresses from the build artifacts of the network in protocol/build
-  CELO_GOLD_ADDRESS: "0xa69c3D18a74B3FD5F8aDA748428d0bfF8c5387Fe"
-  CELO_DOLLAR_ADDRESS: "0x996e24D7791A182f237635018c49E30cdA8FBa5e"
   FAUCET_ADDRESS: "0x387bCb16Bfcd37AccEcF5c9eB2938E30d3aB8BF2"
   VERIFICATION_REWARDS_ADDRESS: "0xb4fdaf5f3cd313654aa357299ada901b1d2dd3b5"
-  ATTESTATIONS_ADDRESS: "0x2cDEc3af5727dF2d490cF6068980E67dc6c19438"
+  WEB3_PROVIDER_URL: "https://pilot-infura.celo-testnet.org/"
diff --git a/packages/blockchain-api/app.pilotstaging.yaml b/packages/blockchain-api/app.pilotstaging.yaml
@@ -5,9 +5,6 @@ env_variables:
   DEPLOY_ENV: "pilotstaging"
   EXCHANGE_RATES_API: "https://api.exchangeratesapi.io"
   BLOCKSCOUT_API: "https://pilotstaging-blockscout.celo-testnet.org/api"
-  # Pull addresses from the build artifacts of the network in protocol/build
-  CELO_GOLD_ADDRESS: "0x2c9829C36c9D0802f04C6a06c423e132a3Ae1767"
-  CELO_DOLLAR_ADDRESS: "0x21C4A2C97eaE0c0E8c630FB3529F7718Fa37eCC1"
   FAUCET_ADDRESS: "0x545DEBe3030B570731EDab192640804AC8Cf65CA"
   VERIFICATION_REWARDS_ADDRESS: "0xb4fdaf5f3cd313654aa357299ada901b1d2dd3b5"
-  ATTESTATIONS_ADDRESS: "0xE3085194DFf8230EBccd5D6C55C59D52Fd9D5b90"
+  WEB3_PROVIDER_URL: "https://pilotstaging-infura.celo-testnet.org/"
diff --git a/packages/blockchain-api/package.json b/packages/blockchain-api/package.json
@@ -16,6 +16,7 @@
     "deploy": "./deploy.sh"
   },
   "dependencies": {
+    "@celo/contractkit": "0.1.6",
     "apollo-datasource-rest": "^0.3.1",
     "apollo-server-express": "^2.4.2",
     "bignumber.js": "^7.2.0",