master

.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
@@ -450,7 +450,7 @@ jobs:
       - run:
           name: Generate DevChain
           command: |
-            (cd packages/cli && yarn test:reset)          
+            (cd packages/cli && yarn test:reset)
       - run:
           name: Run Tests
           command: yarn --cwd=packages/cli test
@@ -468,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
@@ -583,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
@@ -760,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

SETUP.md

@@ -14,6 +14,7 @@
       - [Installing OpenJDK 8](#installing-openjdk-8)
       - [Install Android Dev Tools](#install-android-dev-tools-1)
     - [Some common stuff](#some-common-stuff)
+      - [Install Go](#install-go)
       - [Optional: Install Rust](#optional-install-rust)
       - [Optional: Install an Android Emulator](#optional-install-an-android-emulator)
       - [Optional: Genymotion](#optional-genymotion)
@@ -176,6 +177,23 @@ You can find the complete instructions about how to install the tools in Linux e
 
 ### Some common stuff
 
+#### Install Go
+
+We need Go for [celo-blockchain](https://github.com/celo-org/celo-blockchain), the Go Celo implementation, and `gobind` to build Java language bindings to Go code for the Android Geth client).
+
+Note: We currently use Go 1.11. Brew installs Go 1.12 by default, which is not entirely compatible with our repositories. [Install Go 1.11 manually](https://golang.org/dl/), then run
+
+```
+go get golang.org/x/mobile/cmd/gobind
+```
+
+Execute the following (and make sure the lines are in your `~/.bash_profile`):
+
+```
+export GOPATH=$HOME/go
+export PATH=$PATH:$GOPATH/bin
+```
+
 #### Optional: Install Rust
 
 We use Rust to build the [bls-zexe](https://github.com/celo-org/bls-zexe) repo, which Geth depends on. If you only use the monorepo, you probably don't need this.

package.json

@@ -74,6 +74,7 @@
     "**/codecov/**/js-yaml": "^3.13.1",
     "**/deep-extend": "^0.5.1",
     "**/extend": "^3.0.2",
+    "**/cross-fetch": "^3.0.2",
     "sha3": "1.2.3"
   }
 }

packages/attestation-service/README.md

@@ -0,0 +1,33 @@
+# Attestation Service
+
+A service run by validators on the Celo network to send SMS messages, enabling attestations of user phone numbers and their accounts on the Celo network.
+
+### Configuration
+
+You can use the following environment variables to configure the attestation service:
+
+- `DATABASE_URL` - The URL under which your database is accessible, currently supported are `postgres://`, `mysql://` and `sqlite://`
+- `CELO_PROVIDER` - The URL under which a celo blockchain node is reachable, i.e. something like `https://integration-forno.celo-testnet.org`
+- `ACCOUNT_ADDRESS` - The address of the account on the `Accounts` smart contract
+- `ATTESTATION_KEY` - The private key with which attestations should be signed. You could use your account key for attestations, but really you should authorize a dedicated attestation key
+- `APP_SIGNATURE` - The hash with which clients can auto-read SMS messages on android
+- `SMS_PROVIDERS` - A comma-separated list of providers you want to configure, we currently support:
+
+`nexmo`
+
+- `NEXMO_KEY` - The API key to the Nexmo API
+- `NEXMO_SECRET` - The API secret to the Nexmo API
+- `NEXMO_BLACKLIST` - A comma-sperated list of country codes you do not want to serve
+
+### Running locally
+
+After checking out the source, you should create a local sqlite database by running:
+
+```sh
+yarn run db:create:dev
+yarn run db:migrate:dev
+```
+
+You will also have to set the environment variables in `.env.development`
+
+Then start the service with `yarn run dev` (you'll have to add the appropriate credentials for the text providers)

packages/attestation-service/config/.env.development

@@ -3,5 +3,7 @@ CELO_PROVIDER=https://integration-forno.celo-testnet.org
 ACCOUNT_ADDRESS=0xE6e53b5fc2e18F51781f14a3ce5E7FD468247a15
 ATTESTATION_KEY=x
 APP_SIGNATURE=x
+SMS_PROVIDERS=nexmo
 NEXMO_KEY=x
-NEXMO_SECRET=x
+NEXMO_SECRET=x
+NEXMO_BLACKLIST=

packages/attestation-service/migrations/20191015211858-create-attestation.js

@@ -23,6 +23,14 @@ module.exports = {
           allowNull: false,
           type: Sequelize.STRING,
         },
+        status: {
+          allowNull: false,
+          type: Sequelize.STRING,
+        },
+        smsProvider: {
+          allowNull: false,
+          type: Sequelize.STRING,
+        },
         createdAt: {
           allowNull: false,
           type: Sequelize.DATE,

packages/attestation-service/nodemon.json

@@ -1,6 +1,6 @@
 {
   "ignore": ["**/*.test.ts", "**/*.spec.ts", ".git", "node_modules"],
   "watch": ["src"],
-  "exec": "yarn start",
+  "exec": "yarn start-ts",
   "ext": "ts"
 }

packages/attestation-service/package.json

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