Merge branch 'master' into aaronmgdr/static

* master: Adding a command to the docker script allowing to stop validating (#2295) Update prettier to 1.19.1 to support TypeScript 3.7 (optional chaining, nullish coalescing, etc) (#2358) Fixes needed to make slashing work (#2346) Remove Rewards page from web (#2353) Remove rep sentence from brand kit page (#2350) # Conflicts: # packages/web/src/header/Header.3.tsx # yarn.lock
celo-org · Jan 3, 2020 · a90d747 · a90d747
2 parents aa2fde6 + e9690e3
commit a90d747
Show file tree

Hide file tree

Showing 117 changed files with 836 additions and 950 deletions.
diff --git a/package.json b/package.json
@@ -49,10 +49,10 @@
     "jest-snapshot": "^24.9.0",
     "lerna": "^3.16.0",
     "patch-package": "^5.1.1",
-    "prettier": "1.13.5",
-    "prettier-plugin-java": "^0.4.0",
-    "prettier-plugin-solidity": "1.0.0-alpha.34",
-    "pretty-quick": "^1.11.1",
+    "prettier": "1.19.1",
+    "prettier-plugin-java": "^0.6.0",
+    "prettier-plugin-solidity": "1.0.0-alpha.35",
+    "pretty-quick": "^2.0.1",
     "solc": "0.5.8",
     "ts-jest": "^24.1.0",
     "ts-node": "^8.3.0",
@@ -74,6 +74,8 @@
     "**/extend": "^3.0.2",
     "**/cross-fetch": "^3.0.2",
     "sha3": "1.2.3",
-    "bignumber.js": "9.0.0"
+    "bignumber.js": "9.0.0",
+    "prettier": "^1.19.1",
+    "@types/prettier": "^1.19.0"
   }
 }
diff --git a/packages/attestation-service/src/request.ts b/packages/attestation-service/src/request.ts
@@ -53,9 +53,7 @@ function serializeErrors(errors: t.Errors) {
     const path = error.context.map(({ key }) => key).join('.')
     const value =
       error.message ||
-      `Expected value at path ${path} to be of type ${expectedType.name}, but received ${
-        error.value
-      }`
+      `Expected value at path ${path} to be of type ${expectedType.name}, but received ${error.value}`
 
     // Create recursive payload in case of nested properties
     let payload: any = value

diff --git a/packages/blockchain-api/src/blockscout.ts b/packages/blockchain-api/src/blockscout.ts
@@ -184,9 +184,7 @@ export class BlockscoutAPI extends RESTDataSource {
     })
 
     console.info(
-      `[Celo] getFeedEvents address=${args.address} startblock=${args.startblock} endblock=${
-        args.endblock
-      } rawTransactionCount=${rawTransactions.length} eventCount=${events.length}`
+      `[Celo] getFeedEvents address=${args.address} startblock=${args.startblock} endblock=${args.endblock} rawTransactionCount=${rawTransactions.length} eventCount=${events.length}`
     )
     return events.sort((a, b) => b.timestamp - a.timestamp)
   }
@@ -212,9 +210,7 @@ export class BlockscoutAPI extends RESTDataSource {
       })
     }
     console.info(
-      `[Celo] getFeedRewards address=${args.address} startblock=${args.startblock} endblock=${
-        args.endblock
-      } rawTransactionCount=${rawTransactions.length} rewardsCount=${rewards.length}`
+      `[Celo] getFeedRewards address=${args.address} startblock=${args.startblock} endblock=${args.endblock} rawTransactionCount=${rawTransactions.length} rewardsCount=${rewards.length}`
     )
     return rewards.sort((a, b) => b.timestamp - a.timestamp)
   }

diff --git a/packages/celotool/src/cmds/account/faucet.ts b/packages/celotool/src/cmds/account/faucet.ts
@@ -87,9 +87,7 @@ export const handler = async (argv: FaucetArgv) => {
           (argv.dollar !== 0 && !(await stableToken.balanceOf(address)).isZero())
         ) {
           console.error(
-            `Unable to faucet ${address} on ${
-              argv.celoEnv
-            }: --checkzero specified, but balance is non-zero`
+            `Unable to faucet ${address} on ${argv.celoEnv}: --checkzero specified, but balance is non-zero`
           )
           process.exit(1)
         }

diff --git a/packages/celotool/src/cmds/account/lookup.ts b/packages/celotool/src/cmds/account/lookup.ts
@@ -42,9 +42,7 @@ export const handler = async (argv: LookupArgv) => {
     Object.keys(matchingAddresses).map((address) => {
       const attestationsStats = matchingAddresses[address]
       console.info(
-        `${address} is attested to ${argv.phone} with ${
-          attestationsStats.completed
-        } completed attestations out of ${attestationsStats.total} total`
+        `${address} is attested to ${argv.phone} with ${attestationsStats.completed} completed attestations out of ${attestationsStats.total} total`
       )
     })
   }

diff --git a/packages/celotool/src/cmds/account/verify.ts b/packages/celotool/src/cmds/account/verify.ts
@@ -104,9 +104,7 @@ export async function printCurrentCompletedAttestations(
   const attestationStat = await attestations.getAttestationStat(phoneNumber, account)
 
   console.info(
-    `Phone Number: ${phoneNumber} has completed ${
-      attestationStat.completed
-    } attestations out of a total of ${attestationStat.total}`
+    `Phone Number: ${phoneNumber} has completed ${attestationStat.completed} attestations out of a total of ${attestationStat.total}`
   )
 }
 
@@ -166,9 +164,7 @@ async function promptForCodeAndVerify(
     const userResponse = await prompts({
       type: 'text',
       name: 'code',
-      message: `${
-        attestationsToComplete.length
-      } attestations completable. Enter the code here or type exit`,
+      message: `${attestationsToComplete.length} attestations completable. Enter the code here or type exit`,
     })
 
     if (userResponse.code === 'exit') {

diff --git a/packages/celotool/src/cmds/deploy/initial/blockchain-api.ts b/packages/celotool/src/cmds/deploy/initial/blockchain-api.ts
@@ -17,9 +17,7 @@ export const handler = async (argv: BlockchainApiArgv) => {
   const newFaucetAddress = getAddressFromEnv(AccountType.VALIDATOR, 0) // We use the 0th validator as the faucet
   console.info(`updating blockchain-api yaml file for env ${argv.celoEnv}`)
   await execCmd(
-    `sed -i.bak 's/FAUCET_ADDRESS: .*$/FAUCET_ADDRESS: \"${newFaucetAddress}\"/g' ../blockchain-api/app.${
-      argv.celoEnv
-    }.yaml`
+    `sed -i.bak 's/FAUCET_ADDRESS: .*$/FAUCET_ADDRESS: \"${newFaucetAddress}\"/g' ../blockchain-api/app.${argv.celoEnv}.yaml`
   )
   await execCmd(`rm ../blockchain-api/app.${argv.celoEnv}.yaml.bak`) // Removing temporary bak file
   console.info(`deploying blockchain-api for env ${argv.config} to ${testnetProjectName}`)

diff --git a/packages/celotool/src/cmds/deploy/upgrade/faucet.ts b/packages/celotool/src/cmds/deploy/upgrade/faucet.ts
@@ -70,9 +70,7 @@ export const handler = async (argv: UpgradeFaucetArgs) => {
 
     console.info(`Updating contract addresses for ${argv.celoEnv} on ${argv.firebaseProject}`)
     await execCmd(
-      `yarn --cwd ../faucet cli config:set --net ${argv.celoEnv} --escrowAddress ${
-        addressMap.escrow
-      } --goldTokenAddress ${addressMap.goldToken} --stableTokenAddress ${addressMap.stableToken}`
+      `yarn --cwd ../faucet cli config:set --net ${argv.celoEnv} --escrowAddress ${addressMap.escrow} --goldTokenAddress ${addressMap.goldToken} --stableTokenAddress ${addressMap.stableToken}`
     )
     console.info(`Redepolying functions (neeeded for config changes to take place)`)
     await execCmd('yarn --cwd ../faucet cli deploy:functions')
@@ -92,9 +90,7 @@ export const handler = async (argv: UpgradeFaucetArgs) => {
     await portForwardAnd(argv.celoEnv, fundFaucetAccounts)
 
     console.info(
-      `Done updating contract addresses and funding the faucet account for network ${
-        argv.celoEnv
-      } in ${argv.firebaseProject}`
+      `Done updating contract addresses and funding the faucet account for network ${argv.celoEnv} in ${argv.firebaseProject}`
     )
     console.info('Please double check the TX node IP address to ensure it did not change.')
     process.exit(0)

diff --git a/packages/celotool/src/cmds/gcp/remove-leaked-forwarding-rules.ts b/packages/celotool/src/cmds/gcp/remove-leaked-forwarding-rules.ts
@@ -44,9 +44,7 @@ export const handler = async (argv: Argv) => {
 
       try {
         await execCmd(
-          `gcloud compute target-pools get-health ${target} --region=${zone} --format=json --project=${
-            argv.project
-          }`,
+          `gcloud compute target-pools get-health ${target} --region=${zone} --format=json --project=${argv.project}`,
           {},
           true
         )

diff --git a/packages/celotool/src/cmds/geth/run.ts b/packages/celotool/src/cmds/geth/run.ts
@@ -75,9 +75,8 @@ export const builder = (argv: yargs.Argv) => {
       description: 'Verbosity level',
       default: 5,
     })
-    .coerce(
-      'miner-address',
-      (minerAddress: string) => (minerAddress === null ? null : ensure0x(minerAddress))
+    .coerce('miner-address', (minerAddress: string) =>
+      minerAddress === null ? null : ensure0x(minerAddress)
     )
 }
 

diff --git a/packages/celotool/src/cmds/restore.ts b/packages/celotool/src/cmds/restore.ts
@@ -49,9 +49,7 @@ export const handler = async (argv: RestoreArgv) => {
   // That itself requires that the miner node be stopped.
   // For now, this step is intentionally manual.
   // When we encounter a real world use-case of restore, we can decide whether to automate this or not.
-  const restoreSnapshotCmd = `gcloud compute disks create ${pvcFullId} --source-snapshot=${
-    argv.snapshotname
-  } --type ${diskType}`
+  const restoreSnapshotCmd = `gcloud compute disks create ${pvcFullId} --source-snapshot=${argv.snapshotname} --type ${diskType}`
   await execCmdWithExitOnFailure(restoreSnapshotCmd)
   // const gcloudSnapshotsUrl = 'https://console.cloud.google.com/compute/snapshots'
   // console.info(`Snapshot \"${snapshotName}\" can be seen at ${gcloudSnapshotsUrl}`)

diff --git a/packages/celotool/src/e2e-tests/governance_tests.ts b/packages/celotool/src/e2e-tests/governance_tests.ts
@@ -32,10 +32,9 @@ async function newMemberSwapper(kit: ContractKit, members: string[]): Promise<Me
   }
 
   async function addMember(member: string) {
-    return (await (await kit.contracts.getValidators()).addMember(
-      group,
-      member
-    )).sendAndWaitForReceipt({ from: group })
+    return (
+      await (await kit.contracts.getValidators()).addMember(group, member)
+    ).sendAndWaitForReceipt({ from: group })
   }
 
   async function getGroupMembers() {

diff --git a/packages/celotool/src/lib/attestation-service.ts b/packages/celotool/src/lib/attestation-service.ts
@@ -22,9 +22,9 @@ export async function removeHelmRelease(celoEnv: string) {
 export async function upgradeHelmChart(celoEnv: string) {
   console.info(`Upgrading helm release ${releaseName(celoEnv)}`)
 
-  const upgradeCmdArgs = `${releaseName(
-    celoEnv
-  )} ${helmChartPath} --namespace ${celoEnv} ${(await helmParameters(celoEnv)).join(' ')}`
+  const upgradeCmdArgs = `${releaseName(celoEnv)} ${helmChartPath} --namespace ${celoEnv} ${(
+    await helmParameters(celoEnv)
+  ).join(' ')}`
 
   if (process.env.CELOTOOL_VERBOSE === 'true') {
     await execCmdWithExitOnFailure(`helm upgrade --debug --dry-run ${upgradeCmdArgs}`)

diff --git a/packages/celotool/src/lib/blockscout.ts b/packages/celotool/src/lib/blockscout.ts
@@ -33,12 +33,14 @@ export async function upgradeHelmChart(
   blockscoutDBConnectionName: string
 ) {
   console.info(`Upgrading helm release ${celoEnv}-blockscout`)
-  const params = (await helmParameters(
-    celoEnv,
-    blockscoutDBUsername,
-    blockscoutDBPassword,
-    blockscoutDBConnectionName
-  )).join(' ')
+  const params = (
+    await helmParameters(
+      celoEnv,
+      blockscoutDBUsername,
+      blockscoutDBPassword,
+      blockscoutDBConnectionName
+    )
+  ).join(' ')
   if (process.env.CELOTOOL_VERBOSE === 'true') {
     await execCmdWithExitOnFailure(
       `helm upgrade --debug --dry-run ${celoEnv}-blockscout ../helm-charts/blockscout --namespace ${celoEnv} ${params}`

diff --git a/packages/celotool/src/lib/env-utils.ts b/packages/celotool/src/lib/env-utils.ts
@@ -177,9 +177,7 @@ function celoEnvMiddleware(argv: CeloEnvArgv) {
 export async function doCheckOrPromptIfStagingOrProduction() {
   if (process.env.CELOTOOL_CONFIRMED !== 'true' && isProduction()) {
     await confirmAction(
-      `You are about to apply a possibly irreversible action on a production env: ${
-        process.env.CELOTOOL_CELOENV
-      }. Are you sure?`
+      `You are about to apply a possibly irreversible action on a production env: ${process.env.CELOTOOL_CELOENV}. Are you sure?`
     )
     process.env.CELOTOOL_CONFIRMED = 'true'
   }

diff --git a/packages/celotool/src/lib/geth.ts b/packages/celotool/src/lib/geth.ts
@@ -132,9 +132,11 @@ const getEnodesWithIpAddresses = async (namespace: string, getExternalIP: boolea
       if (getExternalIP) {
         address = txAddresses[index]
       } else {
-        address = (await execCmd(
-          `kubectl get service/${namespace}-service-${index} --namespace ${namespace} -o jsonpath='{.spec.clusterIP}'`
-        ))[0]
+        address = (
+          await execCmd(
+            `kubectl get service/${namespace}-service-${index} --namespace ${namespace} -o jsonpath='{.spec.clusterIP}'`
+          )
+        )[0]
         if (address.length === 0) {
           console.error('IP address is empty for transaction node')
           throw new Error('IP address is empty for transaction node')

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -66,7 +66,7 @@
     "@types/node": "^10",
     "@types/web3": "^1.0.18",
     "globby": "^8",
-    "prettier": "1.13.5",
+    "prettier": "1.19.1",
     "typescript": "^3.7.3"
   },
   "files": [

diff --git a/packages/cli/src/utils/checks.ts b/packages/cli/src/utils/checks.ts
@@ -119,7 +119,10 @@ class CheckBuilder {
     )
 
   isValidator = (account: Address) =>
-    this.addCheck(`${account} is Validator`, this.withValidators((v) => v.isValidator(account)))
+    this.addCheck(
+      `${account} is Validator`,
+      this.withValidators((v) => v.isValidator(account))
+    )
 
   isValidatorGroup = (account: Address) =>
     this.addCheck(

diff --git a/packages/cli/src/utils/identity.ts b/packages/cli/src/utils/identity.ts
@@ -95,8 +95,8 @@ export const displayMetadata = async (metadata: IdentityMetadataWrapper, kit: Co
     const status = verifiable
       ? await verifyClaim(claim, metadata.data.meta.address, metadataURLGetter)
       : validatable
-        ? await validateClaim(claim, metadata.data.meta.address, kit)
-        : 'N/A'
+      ? await validateClaim(claim, metadata.data.meta.address, kit)
+      : 'N/A'
     let extra = ''
     switch (claim.type) {
       case ClaimTypes.ATTESTATION_SERVICE_URL:
@@ -123,10 +123,10 @@ export const displayMetadata = async (metadata: IdentityMetadataWrapper, kit: Co
           ? `Could not verify: ${status}`
           : 'Verified!'
         : validatable
-          ? status
-            ? `Invalid: ${status}`
-            : `Valid!`
-          : 'N/A',
+        ? status
+          ? `Invalid: ${status}`
+          : `Valid!`
+        : 'N/A',
       createdAt: moment.unix(claim.timestamp).fromNow(),
     }
   })

diff --git a/packages/contractkit/src/identity/claims/claim.ts b/packages/contractkit/src/identity/claims/claim.ts
@@ -47,12 +47,12 @@ export type Claim =
 export type ClaimPayload<K extends ClaimTypes> = K extends typeof ClaimTypes.DOMAIN
   ? DomainClaim
   : K extends typeof ClaimTypes.NAME
-    ? NameClaim
-    : K extends typeof ClaimTypes.KEYBASE
-      ? KeybaseClaim
-      : K extends typeof ClaimTypes.ATTESTATION_SERVICE_URL
-        ? AttestationServiceURLClaim
-        : AccountClaim
+  ? NameClaim
+  : K extends typeof ClaimTypes.KEYBASE
+  ? KeybaseClaim
+  : K extends typeof ClaimTypes.ATTESTATION_SERVICE_URL
+  ? AttestationServiceURLClaim
+  : AccountClaim
 
 export const isOfType = <K extends ClaimTypes>(type: K) => (data: Claim): data is ClaimPayload<K> =>
   data.type === type

diff --git a/packages/contractkit/src/utils/tx-signing.test.ts b/packages/contractkit/src/utils/tx-signing.test.ts
@@ -74,9 +74,7 @@ async function verifyLocalSigning(web3: Web3, celoTransaction: CeloTx): Promise<
   if (celoTransaction.gatewayFeeRecipient != null) {
     debug(
       'Checking gateway fee recipient actual ' +
-        `${signedCeloTransaction.gatewayFeeRecipient} expected ${
-          celoTransaction.gatewayFeeRecipient
-        }`
+        `${signedCeloTransaction.gatewayFeeRecipient} expected ${celoTransaction.gatewayFeeRecipient}`
     )
     expect(signedCeloTransaction.gatewayFeeRecipient!.toLowerCase()).toEqual(
       celoTransaction.gatewayFeeRecipient.toLowerCase()

diff --git a/packages/contractkit/src/wrappers/Attestations.ts b/packages/contractkit/src/wrappers/Attestations.ts
@@ -75,9 +75,11 @@ function parseGetCompletableAttestations(response: GetCompletableAttestationsRes
     (response[3] as unknown) as string
   )
 
-  return zip3(response[0].map(valueToInt), response[1], metadataURLs).map(
-    ([blockNumber, issuer, metadataURL]) => ({ blockNumber, issuer, metadataURL })
-  )
+  return zip3(
+    response[0].map(valueToInt),
+    response[1],
+    metadataURLs
+  ).map(([blockNumber, issuer, metadataURL]) => ({ blockNumber, issuer, metadataURL }))
 }
 
 const stringIdentity = (x: string) => x

diff --git a/packages/contractkit/src/wrappers/Governance.ts b/packages/contractkit/src/wrappers/Governance.ts
@@ -367,7 +367,13 @@ export class GovernanceWrapper extends BaseWrapper<Governance> {
     if (!queue) {
       queue = await this.getQueue()
     }
-    return { index: this.getIndex(proposalID, queue.map((record) => record.proposalID)), queue }
+    return {
+      index: this.getIndex(
+        proposalID,
+        queue.map((record) => record.proposalID)
+      ),
+      queue,
+    }
   }
 
   private async lesserAndGreater(proposalID: BigNumber.Value, _queue?: UpvoteRecord[]) {

diff --git a/packages/faucet/src/contracts/types/Escrow.d.ts b/packages/faucet/src/contracts/types/Escrow.d.ts
@@ -39,9 +39,9 @@ export class Escrow extends Contract {
 
     sentPaymentIds(arg0: string, arg1: number | string): TransactionObject<string>
 
-    getReceivedPaymentIds(identifier: string | number[]): TransactionObject<(string)[]>
+    getReceivedPaymentIds(identifier: string | number[]): TransactionObject<string[]>
 
-    getSentPaymentIds(sender: string): TransactionObject<(string)[]>
+    getSentPaymentIds(sender: string): TransactionObject<string[]>
 
     renounceOwnership(): TransactionObject<void>
 

diff --git a/packages/mobile/android/app/src/androidTest/java/org/celo/mobile/DetoxTest.java b/packages/mobile/android/app/src/androidTest/java/org/celo/mobile/DetoxTest.java
@@ -5,8 +5,8 @@
 import androidx.test.rule.ActivityTestRule;
 import com.wix.detox.Detox;
 import org.junit.Rule;
-import org.junit.runner.RunWith;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 @LargeTest

diff --git a/packages/mobile/android/app/src/main/java/org/celo/mobile/MainActivity.java b/packages/mobile/android/app/src/main/java/org/celo/mobile/MainActivity.java
@@ -1,12 +1,12 @@
 package org.celo.mobile;
 
 import android.os.Bundle;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.ReactFragmentActivity;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 import java.util.Date;
 import org.devio.rn.splashscreen.SplashScreen;