Add selectIssuers Transaction

packages/celotool/src/cmds/account/verify.ts

@@ -1,8 +1,11 @@
 import { AccountArgv } from '@celo/celotool/src/cmds/account'
 import { portForwardAnd } from '@celo/celotool/src/lib/port_forward'
-import { CeloContract, newKit } from '@celo/contractkit'
-import { AttestationsWrapper } from '@celo/contractkit/lib/wrappers/Attestations'
-import { ActionableAttestation, decodeAttestationCode } from '@celo/walletkit'
+import { CeloContract, ContractKit, newKit } from '@celo/contractkit'
+import {
+  ActionableAttestation,
+  AttestationsWrapper,
+} from '@celo/contractkit/lib/wrappers/Attestations'
+import { decodeAttestationCode } from '@celo/walletkit'
 import prompts from 'prompts'
 import { switchToClusterFromEnv } from 'src/lib/cluster'
 import * as yargs from 'yargs'
@@ -51,7 +54,12 @@ async function verifyCmd(argv: VerifyArgv) {
   const attestations = await kit.contracts.getAttestations()
   await printCurrentCompletedAttestations(attestations, argv.phone, account)
 
-  let attestationsToComplete = await attestations.getActionableAttestations(argv.phone, account)
+  let currentBlockNumber = await kit.web3.eth.getBlockNumber()
+  let attestationsToComplete = await attestations.getActionableAttestations(
+    argv.phone,
+    account,
+    currentBlockNumber
+  )
 
   // Request more attestations
   if (argv.num > attestationsToComplete.length) {
@@ -72,12 +80,17 @@ async function verifyCmd(argv: VerifyArgv) {
     await result.waitReceipt()
   }
 
-  attestationsToComplete = await attestations.getActionableAttestations(argv.phone, account)
+  currentBlockNumber = await kit.web3.eth.getBlockNumber()
+  attestationsToComplete = await attestations.getActionableAttestations(
+    argv.phone,
+    account,
+    currentBlockNumber
+  )
   // Find attestations we can reveal/verify
   console.info(`Revealing ${attestationsToComplete.length} attestations`)
   await revealAttestations(attestationsToComplete, attestations, argv.phone)
 
-  await promptForCodeAndVerify(attestations, argv.phone, account)
+  await promptForCodeAndVerify(kit, attestations, argv.phone, account)
 }
 
 export async function printCurrentCompletedAttestations(
@@ -157,14 +170,17 @@ async function verifyCode(
 }
 
 async function promptForCodeAndVerify(
+  kit: ContractKit,
   attestations: AttestationsWrapper,
   phoneNumber: string,
   account: string
 ) {
   while (true) {
+    const currentBlockNumber = await kit.web3.eth.getBlockNumber()
     const attestationsToComplete = await attestations.getActionableAttestations(
       phoneNumber,
-      account
+      account,
+      currentBlockNumber
     )
 
     if (attestationsToComplete.length === 0) {

packages/contractkit/src/wrappers/Attestations.ts

@@ -26,7 +26,7 @@ export interface AttestationsToken {
 }
 
 export interface AttestationsConfig {
-  attestationExpirySeconds: number
+  attestationExpiryBlocks: number
   attestationRequestFees: AttestationsToken[]
 }
 
@@ -42,13 +42,13 @@ export enum AttestationState {
 export interface ActionableAttestation {
   issuer: Address
   attestationState: AttestationState
-  time: number
+  blockNumber: number
   publicKey: string
 }
 
 const parseAttestationInfo = (rawState: { 0: string; 1: string }) => ({
   attestationState: parseInt(rawState[0], 10),
-  time: parseInt(rawState[1], 10),
+  blockNumber: parseInt(rawState[1], 10),
 })
 
 function attestationMessageToSign(phoneHash: string, account: Address) {
@@ -63,8 +63,8 @@ export class AttestationsWrapper extends BaseWrapper<Attestations> {
   /**
    *  Returns the time an attestation can be completable before it is considered expired
    */
-  attestationExpirySeconds = proxyCall(
-    this.contract.methods.attestationExpirySeconds,
+  attestationExpiryBlocks = proxyCall(
+    this.contract.methods.attestationExpiryBlocks,
     undefined,
     toNumber
   )
@@ -156,11 +156,11 @@ export class AttestationsWrapper extends BaseWrapper<Attestations> {
    */
   async getActionableAttestations(
     phoneNumber: string,
-    account: Address
+    account: Address,
+    currentBlockNumber: number
   ): Promise<ActionableAttestation[]> {
     const phoneHash = PhoneNumberUtils.getPhoneHash(phoneNumber)
-    const expirySeconds = await this.attestationExpirySeconds()
-    const nowInUnixSeconds = Math.floor(new Date().getTime() / 1000)
+    const expirySeconds = await this.attestationExpiryBlocks()
 
     const issuers = await this.contract.methods.getAttestationIssuers(phoneHash, account).call()
     const issuerState = Promise.all(
@@ -178,14 +178,14 @@ export class AttestationsWrapper extends BaseWrapper<Attestations> {
     )
 
     const isIncomplete = (status: AttestationState) => status === AttestationState.Incomplete
-    const hasNotExpired = (time: number) => nowInUnixSeconds < time + expirySeconds
+    const hasNotExpired = (time: number) => currentBlockNumber < time + expirySeconds
     const isValidKey = (key: string) => key !== null && key !== '0x0'
 
     return zip3(issuers, await issuerState, await publicKeys)
       .filter(
         ([_issuer, attestation, publicKey]) =>
           isIncomplete(attestation.attestationState) &&
-          hasNotExpired(attestation.time) &&
+          hasNotExpired(attestation.blockNumber) &&
           isValidKey(publicKey)
       )
       .map(([issuer, attestation, publicKey]) => ({
@@ -248,7 +248,7 @@ export class AttestationsWrapper extends BaseWrapper<Attestations> {
       })
     )
     return {
-      attestationExpirySeconds: await this.attestationExpirySeconds(),
+      attestationExpiryBlocks: await this.attestationExpiryBlocks(),
       attestationRequestFees: fees,
     }
   }
@@ -311,6 +311,16 @@ export class AttestationsWrapper extends BaseWrapper<Attestations> {
     )
   }
 
+  /**
+   * Selecets the issuers for previously requested attestations for a phone number
+   * @param phoneNumber The phone number for which to request attestations for
+   * @param token The token with which to pay for the attestation fee
+   */
+  async selectIssuers(phoneNumber: string) {
+    const phoneHash = PhoneNumberUtils.getPhoneHash(phoneNumber)
+    return wrapSend(this.kit, this.contract.methods.selectIssuers(phoneHash))
+  }
+
   /**
    * Reveals the phone number to the issuer of the attestation on-chain
    * @param phoneNumber The phone number which requested attestation

packages/protocol/contracts/common/MockSafeCast.sol

@@ -0,0 +1,30 @@
+
+pragma solidity ^0.5.0;
+// TODO: Remove this and use upstream when
+// https://github.com/OpenZeppelin/openzeppelin-contracts/pull/1926/files gets merged
+
+import "./SafeCast.sol";
+
+contract MockSafeCast {
+  using SafeCast for uint;
+
+  function toUint128(uint a) public pure returns (uint128) {
+    return a.toUint128();
+  }
+
+  function toUint64(uint a) public pure returns (uint64) {
+    return a.toUint64();
+  }
+
+  function toUint32(uint a) public pure returns (uint32) {
+    return a.toUint32();
+  }
+
+  function toUint16(uint a) public pure returns (uint16) {
+    return a.toUint16();
+  }
+
+  function toUint8(uint a) public pure returns (uint8) {
+    return a.toUint8();
+  }
+}

packages/protocol/contracts/common/SafeCast.sol

@@ -0,0 +1,88 @@
+pragma solidity ^0.5.0;
+// TODO: Remove this and use upstream when
+// https://github.com/OpenZeppelin/openzeppelin-contracts/pull/1926/files gets merged
+
+/**
+ * @dev Wrappers over Solidity's uintXX casting operators with added overflow
+ * checks.
+ *
+ * Downcasting from uint256 in Solidity does not revert by default on overflow.
+ * This can easily result in undesired exploitation or bugs, since developers
+ * usually assume that overflows raise errors. `SafeCast` restores this intuition
+ * by reverting the transaction when such an operation overflows.
+ *
+ * Using this library instead of the unchecked operations eliminates an entire
+ * class of bugs, so it's recommended to use it always.
+ */
+library SafeCast {
+
+  /**
+    * @dev Returns the downcasted uint128 from uint256, reverting on
+    * overflow (when the input is greater than largest uint128).
+    *
+    * Counterpart to Solidity's `uint128` operator.
+    *
+    * Requirements:
+    * - input must fit into 128 bits
+    */
+  function toUint128(uint256 value) internal pure returns (uint128) {
+    require(value < 2**128, "SafeCast: value doesn\'t fit in 128 bits");
+    return uint128(value);
+  }
+
+  /**
+    * @dev Returns the downcasted uint64 from uint256, reverting on
+    * overflow (when the input is greater than largest uint64).
+    *
+    * Counterpart to Solidity's `uint64` operator.
+    *
+    * Requirements:
+    * - input must fit into 64 bits
+    */
+  function toUint64(uint256 value) internal pure returns (uint64) {
+    require(value < 2**64, "SafeCast: value doesn\'t fit in 64 bits");
+    return uint64(value);
+  }
+
+  /**
+    * @dev Returns the downcasted uint32 from uint256, reverting on
+    * overflow (when the input is greater than largest uint32).
+    *
+    * Counterpart to Solidity's `uint32` operator.
+    *
+    * Requirements:
+    * - input must fit into 32 bits
+    */
+  function toUint32(uint256 value) internal pure returns (uint32) {
+    require(value < 2**32, "SafeCast: value doesn\'t fit in 32 bits");
+    return uint32(value);
+  }
+
+  /**
+    * @dev Returns the downcasted uint16 from uint256, reverting on
+    * overflow (when the input is greater than largest uint16).
+    *
+    * Counterpart to Solidity's `uint16` operator.
+    *
+    * Requirements:
+    * - input must fit into 16 bits
+    */
+  function toUint16(uint256 value) internal pure returns (uint16) {
+    require(value < 2**16, "SafeCast: value doesn\'t fit in 16 bits");
+    return uint16(value);
+  }
+
+  /**
+    * @dev Returns the downcasted uint8 from uint256, reverting on
+    * overflow (when the input is greater than largest uint8).
+    *
+    * Counterpart to Solidity's `uint8` operator.
+    *
+    * Requirements:
+    * - input must fit into 8 bits.
+    */
+  function toUint8(uint256 value) internal pure returns (uint8) {
+    require(value < 2**8, "SafeCast: value doesn\'t fit in 8 bits");
+    return uint8(value);
+  }
+}