Merge branch 'master' into aaronmgdr/build4

* master: (81 commits) Make styling more consistent in validator quick start and add password prompt to account:unlock (#1731) New Version for contractkit (#1727) Remove end-to-end attestations test from circle (#1739) Added helper function to get the list of current validators (#1713) Fix flaky end-to-end transfer, protocol unit tests (#1734) Add AccountClaim to Metadata (#1663) [Wallet] Set default gradle properties (#1629) Update genesis block after adding parent signatures to block header (#1732) Removed end-to-end-geth-integration-sync-test job in workflow (#1730) Change the event we emit when selecting issuers (#1706) [Wallet] Prompt user to restart app when turning off Forno a second time (#1708) Check in spanish verification translations (#1726) [Wallet] Style fixes on iOS for verification and backup flows (#1718) [Wallet] Reset isRedeemingInvite on rehydrate (#1716) Adjust e2e transfer and governance tests to match new fee distribution and eliminate ProposerFraction (#1585) [Wallet] Add more local currencies (#1698) Switch to correct cluster when fauceting (#1687) [Wallet] Use the country of the phone number for determining the default local currency (#1684) [Wallet] Limit QR code scanner to 1 code per second (#1676) Update Dark backgrounds text color (#1677) ... # Conflicts: # packages/web/pages/_app.tsx # packages/web/src/dev/BuildPage.tsx # packages/web/src/dev/Cover.tsx # packages/web/src/dev/StackSection.tsx # yarn.lock
celo-org · Nov 15, 2019 · 0d2f380 · 0d2f380
2 parents 563cbd2 + 05c3f96
commit 0d2f380
Show file tree

Hide file tree

Showing 629 changed files with 21,283 additions and 13,455 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,8 +12,8 @@ reference:
     shell: /bin/bash --login -eo pipefail
     environment:
       TERM: dumb
-      _JAVA_OPTIONS: "-Xmx7g -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
-      GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true -Dorg.gradle.jvmargs="-Xmx6g -XX:MaxPermSize=3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"'
+      _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
+      GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true"
 
 defaults: &defaults
   working_directory: ~/app
@@ -28,8 +28,8 @@ android-defaults: &android-defaults
   docker:
     - image: circleci/android:api-28-node
   environment:
-    _JAVA_OPTIONS: "-Xmx7g -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
-    GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true -Dorg.gradle.jvmargs="-Xmx6g -XX:MaxPermSize=3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"'
+    _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
+    GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true"
 
 e2e-defaults: &e2e-defaults
   <<: *defaults
@@ -240,7 +240,7 @@ jobs:
       - run:
           name: Start pidcat logging
           command: pidcat -t "GoLog" -t "Go" # React logs are on metro step since RN 61
-          background: true 
+          background: true
       - run:
           name: Run yarn dev
           command: cd ~/src/packages/mobile && ENVFILE=".env.test" yarn dev
@@ -249,7 +249,7 @@ jobs:
           command: adb kill-server && adb start-server
       - run:
           name: Run test itself
-          
+
           command: |
             cd ~/src/packages/mobile 
             # detox sometimes without releasing the terminal and thus making the CI timout
@@ -448,10 +448,12 @@ jobs:
       - attach_workspace:
           at: ~/app
       - run:
-          name: Test
+          name: Generate DevChain
           command: |
-            set -euo pipefail
-            yarn --cwd=packages/cli test
+            (cd packages/cli && yarn test:reset)
+      - run:
+          name: Run Tests
+          command: yarn --cwd=packages/cli test
       - run:
           name: Fail if someone forgot to commit CLI docs
           command: |
@@ -466,15 +468,16 @@ jobs:
           command: |
             yarn --cwd=packages/cli run celocli account:new
 
-      - run:
-          name: Install and test the npm package
-          command: |
-            set -euo pipefail
-            cd packages/cli
-            yarn pack
-            cd /tmp
-            npm install ~/app/packages/cli/celo-celocli-*.tgz
-            ./node_modules/.bin/celocli account:new # Small test
+      # Won't work when cli uses git dependencies!
+      # - run:
+      #     name: Install and test the npm package
+      #     command: |
+      #       set -euo pipefail
+      #       cd packages/cli
+      #       yarn pack
+      #       cd /tmp
+      #       npm install ~/app/packages/cli/celo-celocli-*.tgz
+      #       ./node_modules/.bin/celocli account:new # Small test
 
   typescript-test:
     <<: *defaults
@@ -524,7 +527,7 @@ jobs:
             cd packages/celotool
             ./ci_test_transfers.sh checkout master
 
-  end-to-end-geth-exit-test:
+  end-to-end-geth-blockchain-parameters-test:
     <<: *e2e-defaults
     steps:
       - attach_workspace:
@@ -540,7 +543,7 @@ jobs:
           command: |
             set -e
             cd packages/celotool
-            ./ci_test_exit.sh checkout master
+            ./ci_test_blockchain_parameters.sh checkout master
 
   end-to-end-geth-governance-test:
     <<: *e2e-defaults
@@ -581,41 +584,6 @@ jobs:
             cd packages/celotool
             ./ci_test_sync.sh checkout master
 
-  end-to-end-geth-integration-sync-test:
-    <<: *e2e-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: Run test
-          command: |
-            set -e
-            cd packages/celotool
-            ./ci_test_sync_with_network.sh checkout master
-
-  end-to-end-geth-attestations-test:
-    <<: *e2e-defaults
-    resource_class: medium+
-    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: Run test
-          command: |
-            set -e
-            cd packages/celotool
-            ./ci_test_attestations.sh checkout master
-
   end-to-end-geth-validator-order-test:
     <<: *e2e-defaults
     resource_class: large
@@ -746,7 +714,7 @@ workflows:
           requires:
             - lint-checks
             - contractkit-test
-      - end-to-end-geth-exit-test:
+      - end-to-end-geth-blockchain-parameters-test:
           requires:
             - lint-checks
             - contractkit-test
@@ -758,14 +726,6 @@ workflows:
           requires:
             - lint-checks
             - contractkit-test
-      - end-to-end-geth-integration-sync-test:
-          requires:
-            - lint-checks
-            - contractkit-test
-      - end-to-end-geth-attestations-test:
-          requires:
-            - lint-checks
-            - contractkit-test
       - end-to-end-geth-validator-order-test:
           requires:
             - lint-checks

diff --git a/.env b/.env
@@ -17,17 +17,17 @@ BLOCKSCOUT_WEB_REPLICAS=3
 BLOCKSCOUT_DB_SUFFIX=
 
 ETHSTATS_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/ethstats"
-ETHSTATS_DOCKER_IMAGE_TAG="i0ffe524c625ea59e4492dc92c2e638689c36e4b0"
+ETHSTATS_DOCKER_IMAGE_TAG="0ffe524c625ea59e4492dc92c2e638689c36e4b0"
 
 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="ba213df07070433970d9b2cf75bae1d146cbfeda"
+GETH_NODE_DOCKER_IMAGE_TAG="7ccc0a81920e6e09663855fc0ed46a98d634e74a"
 
 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="ba213df07070433970d9b2cf75bae1d146cbfeda"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="7ccc0a81920e6e09663855fc0ed46a98d634e74a"
 
 CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
 CELOTOOL_DOCKER_IMAGE_TAG="celotool-dfdc3e8b26e98aa294b27e2b5621c184488a10db"
@@ -36,7 +36,7 @@ TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-m
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-d3d165a7db548d175cd703c86c20c1657c04368d"
 
 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-74f329b014c40c7af19cf89b4c0d080c344d4a1c"
 
 GETH_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet-production/geth-exporter"
 GETH_EXPORTER_DOCKER_IMAGE_TAG="ed7d21bd50592709173368cd697ef73c1774a261"

diff --git a/.env.alfajores b/.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

diff --git a/.env.alfajoresstaging b/.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

diff --git a/.env.mnemonic.enc b/.env.mnemonic.enc
diff --git a/.env.pilot b/.env.pilot
@@ -14,27 +14,30 @@ 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="2"
+BLOCKSCOUT_DB_SUFFIX="4"
 BLOCKSCOUT_SUBNETWORK_NAME="Pilot"
 
 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="f68c6301cad91196867f06c701e6b4aa30838939"
+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="f68c6301cad91196867f06c701e6b4aa30838939"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="9575a01c12438e1adc6bb610c891cb5066aaa7aa"
 
 CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-CELOTOOL_DOCKER_IMAGE_TAG="celotool-2a96d35273ba2f8db80ba529a05c614171c24491"
+CELOTOOL_DOCKER_IMAGE_TAG="celotool-552b1accf90404fdcd886670d150af0a5cae116f"
 
 TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-2616309a839a30e53faecfafb9b68ab51a5fcdcf"
+TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-552b1accf90404fdcd886670d150af0a5cae116f"
+
+ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
+ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-5035b241cbcfbd4f261e3d77e1fca8f6dc8edc32"
 
 GETH_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet-production/geth-exporter"
-GETH_EXPORTER_DOCKER_IMAGE_TAG="ed7d21bd50592709173368cd697ef73c1774a261"
+GETH_EXPORTER_DOCKER_IMAGE_TAG="6df683de7ae30d3fbca384abb14599d0e8130d35"
 
 # Genesis Vars
 NETWORK_ID=1101
@@ -50,8 +53,8 @@ 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
-
-ADMIN_RPC_ENABLED=false
+IN_MEMORY_DISCOVERY_TABLE=false
+PING_IP_FROM_PACKET=true
 
 # Testnet vars
 GETH_NODES_BACKUP_CRONJOB_ENABLED=true
@@ -77,6 +80,4 @@ NOTIFICATION_SERVICE_FIREBASE_DB="https://console.firebase.google.com/u/0/projec
 PROMTOSD_SCRAPE_INTERVAL="5m"
 PROMTOSD_EXPORT_INTERVAL="5m"
 
-AUCTION_CRON_SPEC="*/5 * * * *"
-
 SMS_RETRIEVER_HASH_CODE=1SlgTw9pFW5
diff --git a/.env.pilotstaging b/.env.pilotstaging
@@ -14,30 +14,36 @@ 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="5"
+BLOCKSCOUT_DB_SUFFIX="7"
 BLOCKSCOUT_SUBNETWORK_NAME="Pilot 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="f68c6301cad91196867f06c701e6b4aa30838939"
+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="f68c6301cad91196867f06c701e6b4aa30838939"
+GETH_BOOTNODE_DOCKER_IMAGE_TAG="9575a01c12438e1adc6bb610c891cb5066aaa7aa"
 
 CELOTOOL_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
-CELOTOOL_DOCKER_IMAGE_TAG="celotool-2a96d35273ba2f8db80ba529a05c614171c24491"
+CELOTOOL_DOCKER_IMAGE_TAG="celotool-552b1accf90404fdcd886670d150af0a5cae116f"
+
+TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
+TRANSACTION_METRICS_EXPORTER_DOCKER_IMAGE_TAG="transaction-metrics-exporter-552b1accf90404fdcd886670d150af0a5cae116f"
+
+ATTESTATION_SERVICE_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet/celo-monorepo"
+ATTESTATION_SERVICE_DOCKER_IMAGE_TAG="attestation-service-5035b241cbcfbd4f261e3d77e1fca8f6dc8edc32"
 
 GETH_EXPORTER_DOCKER_IMAGE_REPOSITORY="gcr.io/celo-testnet-production/geth-exporter"
-GETH_EXPORTER_DOCKER_IMAGE_TAG="ed7d21bd50592709173368cd697ef73c1774a261"
+GETH_EXPORTER_DOCKER_IMAGE_TAG="6df683de7ae30d3fbca384abb14599d0e8130d35"
 
 # Genesis Vars
 NETWORK_ID=1101
 CONSENSUS_TYPE="istanbul"
 BLOCK_TIME=5
-EPOCH=17280   // Minimum epoch length is 1 day
+EPOCH=720   // 1 hour
 ISTANBUL_REQUEST_TIMEOUT_MS=10000
 
 # "og" -> our original 4 tx nodes, "${n}" -> for deriving n tx nodes from the MNEMONIC
@@ -47,8 +53,8 @@ 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
-
-ADMIN_RPC_ENABLED=false
+IN_MEMORY_DISCOVERY_TABLE=false
+PING_IP_FROM_PACKET=true
 
 # Testnet vars
 GETH_NODES_BACKUP_CRONJOB_ENABLED=true
@@ -74,6 +80,4 @@ NOTIFICATION_SERVICE_FIREBASE_DB="https://console.firebase.google.com/u/0/projec
 PROMTOSD_SCRAPE_INTERVAL="5m"
 PROMTOSD_EXPORT_INTERVAL="5m"
 
-AUCTION_CRON_SPEC="*/5 * * * *"
-
 SMS_RETRIEVER_HASH_CODE=1SlgTw9pFW5
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -6,4 +6,12 @@ module.exports = {
   printWidth: 100,
   tabWidth: 2,
   bracketSpacing: true,
+  overrides: [
+    {
+      files: '**/*.sol',
+      options: {
+        singleQuote: false,
+      },
+    },
+  ],
 }