celo-org · cmcewen · Sep 30, 2019 · Sep 26, 2019 · Sep 27, 2019 · Sep 27, 2019
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -8,7 +8,7 @@
 /packages/cli/ @mcortesi @asaj
 /packages/helm-charts/ @nambrot @timmoreton
 /packages/mobile/ @cmcewen @jmrossy
-/packages/notification-service/ @jmrossy @cmcewen
+/packages/notification-service/ @annakaz @cmcewen
 /packages/protocol/ @asaj @m-chrzan
 /packages/react-components/ @cmcewen @jmrossy
 /packages/walletkit/ @ashishb @yerdua

diff --git a/lerna.json b/lerna.json
@@ -3,5 +3,5 @@
   "packages": ["packages/*"],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "1.0.0"
+  "version": "independent"
 }
diff --git a/packages/attestation-service/package.json b/packages/attestation-service/package.json
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@celo/contractkit": "0.1.1",
-    "@celo/utils": "^0.0.6-beta5",
+    "@celo/utils": "^0.1.0",
     "bignumber.js": "^7.2.0",
     "body-parser": "1.19.0",
     "debug": "^4.1.1",

diff --git a/packages/attestation-service/tsconfig.json b/packages/attestation-service/tsconfig.json
@@ -4,5 +4,6 @@
     "rootDir": "src",
     "outDir": "lib"
   },
-  "include": ["src", "types/", "index.d.ts"]
+  "include": ["src", "types/", "index.d.ts"],
+  "references": [{ "path": "../utils" }]
 }
@@ -7,9 +7,9 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@celo/verification-pool-api": "^1.0.0",
-    "@celo/utils": "^0.0.6-beta5",
+    "@celo/utils": "^0.1.0",
     "@celo/walletkit": "^0.0.14",
-    "@celo/contractkit": "0.1.1",
+    "@celo/contractkit": "0.1.5",
     "@google-cloud/monitoring": "0.7.1",
     "@google-cloud/pubsub": "^0.28.1",
     "@google-cloud/storage": "^2.4.3",

@@ -14,5 +14,6 @@
     }
   },
   "include": ["src/"],
-  "exclude": ["node_modules/"]
+  "exclude": ["node_modules/"],
+  "references": [{ "path": "../utils" }]
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -29,7 +29,7 @@
     "test": "TZ=UTC jest"
   },
   "dependencies": {
-    "@celo/utils": "^0.0.6-beta5",
+    "@celo/utils": "^0.1.0",
     "@celo/contractkit": "^0.1.1",
     "@oclif/command": "^1",
     "@oclif/config": "^1",

diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
@@ -5,5 +5,6 @@
     "outDir": "lib",
     "esModuleInterop": true
   },
-  "include": ["src"]
+  "include": ["src"],
+  "references": [{ "path": "../utils" }]
 }
diff --git a/packages/contractkit/package.json b/packages/contractkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@celo/contractkit",
-  "version": "0.1.1",
+  "version": "0.1.6",
   "description": "Celo's ContractKit to interact with Celo network",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -25,7 +25,8 @@
     "lint": "tslint -c tslint.json --project ."
   },
   "dependencies": {
-    "@celo/utils": "^0.0.6-beta5",
+    "@0x/subproviders": "^5.0.0",
+    "@celo/utils": "^0.1.0",
     "@types/debug": "^4.1.5",
     "bignumber.js": "^7.2.0",
     "debug": "^4.1.1",

diff --git a/packages/contractkit/tsconfig.json b/packages/contractkit/tsconfig.json
@@ -4,5 +4,6 @@
     "rootDir": "src",
     "outDir": "lib"
   },
-  "include": ["src", "types/"]
+  "include": ["src", "types/"],
+  "references": [{ "path": "../utils" }]
 }
diff --git a/packages/dappkit/package.json b/packages/dappkit/package.json
@@ -5,8 +5,8 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@celo/contractkit": "0.1.1",
-    "@celo/utils": "0.0.6-beta5",
+    "@celo/contractkit": "0.1.5",
+    "@celo/utils": "^0.1.0",
     "expo": "^34.0.1",
     "expo-contacts": "6.0.0",
     "libphonenumber-js": "^1.7.22"

diff --git a/packages/dappkit/tsconfig.json b/packages/dappkit/tsconfig.json
@@ -4,5 +4,6 @@
     "rootDir": "src",
     "outDir": "lib"
   },
-  "include": ["src", "types/"]
+  "include": ["src", "types/"],
+  "references": [{ "path": "../utils" }]
 }
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
@@ -48,7 +48,7 @@
   "dependencies": {
     "@celo/client": "2d1d8ca",
     "@celo/react-native-sms-retriever": "git+https://github.com/celo-org/react-native-sms-retriever#d3a2fdb",
-    "@celo/utils": "^0.0.6-beta5",
+    "@celo/utils": "^0.1.0",
     "@celo/walletkit": "^0.0.14",
     "@react-native-community/netinfo": "^2.0.4",
     "@segment/analytics-react-native": "^1.1.0-beta.1",

diff --git a/packages/mobile/tsconfig.json b/packages/mobile/tsconfig.json
@@ -16,5 +16,6 @@
     "target": "es2015",
     "strict": true
   },
-  "exclude": ["node_modules", "vendor", ".bundle"]
+  "exclude": ["node_modules", "vendor", ".bundle"],
+  "references": [{ "path": "../utils" }]
 }
diff --git a/packages/notification-service/README.md b/packages/notification-service/README.md
@@ -16,6 +16,14 @@ Next, run this task to build, configure, and start the service:
 
     yarn start:local
 
+## Updating environments
+
+To find a web3 provider for an environment, run
+
+    kubectl get svc -n alfajores --context gke_celo-testnet-production_us-west1-a_alfajores
+
+then look for the external IP for one of the tx nodes, for example `alfajores-service-0`.
+
 ## Deploying to App Engine
 
 Deploy your app. The project will be built automatically by Google Cloud Build:

diff --git a/packages/notification-service/app.integration.yaml b/packages/notification-service/app.integration.yaml
@@ -1,6 +1,5 @@
-runtime: nodejs
-env: flex 
-service: integration 
+runtime: nodejs8
+service: integration
 instance_class: B4
 manual_scaling:
-  instances: 1
+  instances: 1
diff --git a/packages/notification-service/config/config.alfajores.env b/packages/notification-service/config/config.alfajores.env
@@ -3,8 +3,6 @@ PORT=80
 FIREBASE_DB=https://celo-org-mobile-alfajores.firebaseio.com
 BLOCKSCOUT_API=https://alfajores-blockscout.celo-testnet.org/api?
 NODE_TLS_REJECT_UNAUTHORIZED=0
-STABLE_TOKEN_ADDRESS=0xd4b4fcaCAc9e23225680e89308E0a4C41Dd9C6B4
-GOLD_TOKEN_ADDRESS=0x11CD75C45638Ec9f41C0e8Df78fc756201E48ff2
 DEFAULT_LOCALE=en
 NOTIFICATION_TTL_MS=604800000
 POLLING_INTERVAL=1000

diff --git a/packages/notification-service/config/config.alfajoresstaging.env b/packages/notification-service/config/config.alfajoresstaging.env
@@ -3,8 +3,7 @@ PORT=80
 FIREBASE_DB=https://celo-org-mobile-alfajoresstaging.firebaseio.com/
 BLOCKSCOUT_API=https://alfajoresstaging-blockscout.celo-testnet.org/api?
 NODE_TLS_REJECT_UNAUTHORIZED=0
-STABLE_TOKEN_ADDRESS=0x2dF4dD6Bd1b26a8503F763506bdB8e7cf165f69E
-GOLD_TOKEN_ADDRESS=0x1313e2f3EBef8f0d869EECEb796D55A066eEA863
 DEFAULT_LOCALE=es
 NOTIFICATION_TTL_MS=604800000
 POLLING_INTERVAL=1000
+WEB3_PROVIDER_URL=http://35.233.160.250:8545
diff --git a/packages/notification-service/config/config.integration.env b/packages/notification-service/config/config.integration.env
@@ -3,10 +3,8 @@ PORT=80
 FIREBASE_DB=https://celo-org-mobile-int.firebaseio.com
 BLOCKSCOUT_API=https://integration-blockscout.celo-testnet.org/api?
 NODE_TLS_REJECT_UNAUTHORIZED=0
-STABLE_TOKEN_ADDRESS=0x47736AB66b892b0FCCb5c7d69B879C6141F6E80c
-GOLD_TOKEN_ADDRESS=0x9102eCD93ac8D66bAc3D397BF52bc57Ee34Bcb87
 DEFAULT_LOCALE=en
 NOTIFICATION_TTL_MS=604800000
 POLLING_INTERVAL=1000
 EXCHANGE_POLLING_INTERVAL=1800000
-WEB3_PROVIDER_URL=http://34.83.137.48:8545
+WEB3_PROVIDER_URL=http://35.233.200.197:8545
diff --git a/packages/notification-service/config/config.local.env b/packages/notification-service/config/config.local.env
@@ -3,11 +3,9 @@ PORT=8080
 FIREBASE_DB=https://celo-org-mobile-int.firebaseio.com
 BLOCKSCOUT_API=https://integration-blockscout.celo-testnet.org/api?
 NODE_TLS_REJECT_UNAUTHORIZED=0
-STABLE_TOKEN_ADDRESS=0x94a076695b5c4050fbe57ab205e31c18bddb7cb5
-GOLD_TOKEN_ADDRESS=0x140ad3e4625160f48208daf47ca7fdff40527f5f
 DEFAULT_LOCALE=en
 GOOGLE_APPLICATION_CREDENTIALS="./config/serviceAccountKey.json"
 NOTIFICATION_TTL_MS=604800000
 POLLING_INTERVAL=5000
 EXCHANGE_POLLING_INTERVAL=1800000
-WEB3_PROVIDER_URL=http://34.83.137.48:8545
+WEB3_PROVIDER_URL=http://35.233.200.197:8545
diff --git a/packages/notification-service/config/config.pilot.env b/packages/notification-service/config/config.pilot.env
@@ -3,8 +3,7 @@ PORT=80
 FIREBASE_DB=https://celo-org-mobile-pilot.firebaseio.com
 BLOCKSCOUT_API=https://pilot-blockscout.celo-testnet.org/api?
 NODE_TLS_REJECT_UNAUTHORIZED=0
-STABLE_TOKEN_ADDRESS=0x996e24D7791A182f237635018c49E30cdA8FBa5e
-GOLD_TOKEN_ADDRESS=0xa69c3D18a74B3FD5F8aDA748428d0bfF8c5387Fe
 DEFAULT_LOCALE=en
 NOTIFICATION_TTL_MS=604800000
 POLLING_INTERVAL=1000
+WEB3_PROVIDER_URL=http://35.203.185.89:8545
diff --git a/packages/notification-service/config/config.pilotstaging.env b/packages/notification-service/config/config.pilotstaging.env
diff --git a/packages/notification-service/config/config.production.env b/packages/notification-service/config/config.production.env
diff --git a/packages/notification-service/config/config.test.env b/packages/notification-service/config/config.test.env
@@ -0,0 +1,11 @@
+ENVIRONMENT=local
+PORT=8080
+FIREBASE_DB=https://celo-org-mobile-int.firebaseio.com
+BLOCKSCOUT_API=https://integration-blockscout.celo-testnet.org/api?
+NODE_TLS_REJECT_UNAUTHORIZED=0
+DEFAULT_LOCALE=en
+GOOGLE_APPLICATION_CREDENTIALS="./config/serviceAccountKey.json"
+NOTIFICATION_TTL_MS=604800000
+POLLING_INTERVAL=5000
+EXCHANGE_POLLING_INTERVAL=1800000
+WEB3_PROVIDER_URL=http://35.233.200.197:8545
diff --git a/packages/notification-service/jest.setup.ts b/packages/notification-service/jest.setup.ts
@@ -1,7 +1,4 @@
 jest.mock('./src/config', () => ({
   ...jest.requireActual('./src/config'),
-  BLOCKSCOUT_API: '',
-  STABLE_TOKEN_ADDRESS: '',
-  GOLD_TOKEN_ADDRESS: '',
   NOTIFICATIONS_DISABLED: true,
 }))
diff --git a/packages/notification-service/package.json b/packages/notification-service/package.json
@@ -11,16 +11,16 @@
   "scripts": {
     "build": "tsc",
     "gcp-build": "npm run build",
-    "test": "export TZ=UTC && jest",
+    "test": "cp config/config.test.env .env; export TZ=UTC && jest",
     "test:watch": "yarn test --watch",
     "lint": "tslint -c tslint.json --project tsconfig.json",
     "start": "node ./dist/index.js",
     "start:local": "npm run build; cp config/config.local.env .env; node --inspect ./dist/index.js",
     "deploy": "./deploy.sh"
   },
   "dependencies": {
-    "@celo/utils": "^0.0.6-beta5",
-    "@celo/walletkit": "^0.0.14",
+    "@celo/contractkit": "0.1.5",
+    "@celo/utils": "^0.1.0",
     "async-polling": "^0.2.1",
     "bignumber.js": "^7.2.0",
     "dotenv": "^6.0.0",

diff --git a/packages/notification-service/src/blockscout/transfers.ts b/packages/notification-service/src/blockscout/transfers.ts
@@ -1,8 +1,8 @@
 import BigNumber from 'bignumber.js'
 import fetch from 'node-fetch'
-import { BLOCKSCOUT_API, GOLD_TOKEN_ADDRESS, STABLE_TOKEN_ADDRESS } from '../config'
+import { BLOCKSCOUT_API } from '../config'
 import { getLastBlockNotified, sendPaymentNotification, setLastBlockNotified } from '../firebase'
-import { removeEmptyValuesFromObject } from '../util/utils'
+import { getTokenAddresses, removeEmptyValuesFromObject } from '../util/utils'
 import { Log, Response, Transfer } from './blockscout'
 import { decodeLogs } from './decode'
 
@@ -121,15 +121,16 @@ export async function handleTransferNotifications(): Promise<void> {
     return
   }
 
+  const { goldTokenAddress, stableTokenAddress } = await getTokenAddresses()
   const {
     transfers: goldTransfers,
     latestBlock: goldTransfersLatestBlock,
-  } = await getLatestTokenTransfers(GOLD_TOKEN_ADDRESS, lastBlockNotified, Currencies.GOLD)
+  } = await getLatestTokenTransfers(goldTokenAddress, lastBlockNotified, Currencies.GOLD)
 
   const {
     transfers: stableTransfers,
     latestBlock: stableTransfersLatestBlock,
-  } = await getLatestTokenTransfers(STABLE_TOKEN_ADDRESS, lastBlockNotified, Currencies.DOLLAR)
+  } = await getLatestTokenTransfers(stableTokenAddress, lastBlockNotified, Currencies.DOLLAR)
 
   const allTransfers = filterAndJoinTransfers(goldTransfers, stableTransfers)
 

diff --git a/packages/notification-service/src/config.ts b/packages/notification-service/src/config.ts
@@ -30,8 +30,6 @@ export const FIREBASE_DB = process.env.FIREBASE_DB
 const ENFORCE_NOTIFICATIONS = process.env.ENFORCE_LOCAL_NOTIFICATIONS === 'true'
 export const NOTIFICATIONS_DISABLED = !ENFORCE_NOTIFICATIONS && ENVIRONMENT === 'local'
 export const BLOCKSCOUT_API = process.env.BLOCKSCOUT_API
-export const STABLE_TOKEN_ADDRESS = (process.env.STABLE_TOKEN_ADDRESS || '').toLowerCase()
-export const GOLD_TOKEN_ADDRESS = (process.env.GOLD_TOKEN_ADDRESS || '').toLowerCase()
 export const DEFAULT_LOCALE = process.env.DEFAULT_LOCALE
 export const POLLING_INTERVAL = Number(process.env.POLLING_INTERVAL) || 1000
 export const NOTIFICATIONS_TTL_MS = Number(process.env.NOTIFICATION_TTL_MS) || 3600 * 1000 * 24 * 7 // 1 week in milliseconds

diff --git a/packages/notification-service/src/exchange/exchangeQuery.ts b/packages/notification-service/src/exchange/exchangeQuery.ts
@@ -1,9 +1,8 @@
+import { ContractKit } from '@celo/contractkit'
 import { CURRENCY_ENUM } from '@celo/utils'
-import { ContractUtils } from '@celo/walletkit' // To be updated to contractkit when new version is published on npm
 import BigNumber from 'bignumber.js'
-import Web3 from 'web3'
-import { WEB3_PROVIDER_URL } from '../config'
 import { writeExchangeRatePair } from '../firebase'
+import { getContractKit } from '../util/utils'
 
 // Amounts to estimate the exchange rate, as the rate varies based on transaction size
 const SELL_AMOUNTS = {
@@ -12,34 +11,22 @@ const SELL_AMOUNTS = {
 }
 
 export async function handleExchangeQuery() {
-  const web3Instance = await getWeb3Instance()
+  const contractKitInstance = await getContractKit()
   const fetchTime = Date.now().toString()
   const [dollarMakerRate, goldMakerRate] = await Promise.all([
-    getExchangeRate(CURRENCY_ENUM.DOLLAR, web3Instance),
-    getExchangeRate(CURRENCY_ENUM.GOLD, web3Instance),
+    getExchangeRate(CURRENCY_ENUM.DOLLAR, contractKitInstance),
+    getExchangeRate(CURRENCY_ENUM.GOLD, contractKitInstance),
   ])
 
   writeExchangeRatePair(CURRENCY_ENUM.DOLLAR, dollarMakerRate.toString(), fetchTime)
   writeExchangeRatePair(CURRENCY_ENUM.GOLD, goldMakerRate.toString(), fetchTime)
 }
 
-export async function getExchangeRate(makerToken: CURRENCY_ENUM, web3Instance: Web3) {
-  const rate = await ContractUtils.getExchangeRate(
-    web3Instance,
-    makerToken,
-    SELL_AMOUNTS[makerToken]
+async function getExchangeRate(makerToken: CURRENCY_ENUM, contractKitInstance: ContractKit) {
+  const exchange = await contractKitInstance.contracts.getExchange()
+  const rate = await exchange.getExchangeRate(
+    SELL_AMOUNTS[makerToken],
+    makerToken === CURRENCY_ENUM.GOLD
   )
   return rate
 }
-
-let web3: Web3
-export async function getWeb3Instance(): Promise<Web3> {
-  if (web3 && (await web3.eth.net.isListening())) {
-    // Already connected
-    return web3
-  } else {
-    const httpProvider = new Web3.providers.HttpProvider(WEB3_PROVIDER_URL)
-    web3 = new Web3(httpProvider)
-    return web3
-  }
-}
diff --git a/packages/notification-service/src/index.ts b/packages/notification-service/src/index.ts
@@ -68,6 +68,7 @@ notificationPolling.run()
 
 if (!WEB3_PROVIDER_URL) {
   console.info('No Web3 provider found. Skipping exchange polling.')
+  console.info('Note that you will need to manually set contract addresses.')
 } else {
   /**
    * Start polling the Exchange contract