Komenci <> Valora Integration: invites and escrow

dependency-graph.json

@@ -112,6 +112,7 @@
     "dependencies": [
       "@celo/contractkit",
       "@celo/flake-tracker",
+      "@celo/komencikit",
       "@celo/react-components",
       "@celo/typescript",
       "@celo/utils"

packages/contractkit/src/explorer/block-explorer.ts

@@ -140,7 +140,7 @@ export class BlockExplorer {
       matchedAbi.signature === PROXY_SET_AND_INITIALIZE_IMPLEMENTATION_SIGNATURE &&
       args.length === 2
     ) {
-      const initializeAbi = getInitializeAbiOfImplementation(contract)
+      const initializeAbi = getInitializeAbiOfImplementation(contract as any)
       const encodedInitializeParameters = args[1].slice(10)
 
       const { params: initializeParams } = parseDecodedParams(

packages/contractkit/src/governance/proposals.ts

@@ -161,7 +161,7 @@ export class ProposalBuilder {
     ) {
       // Transform array of initialize arguments (if provided) into delegate call data
       tx.args[1] = this.kit.web3.eth.abi.encodeFunctionCall(
-        getInitializeAbiOfImplementation(tx.contract),
+        getInitializeAbiOfImplementation(tx.contract as any),
         tx.args[1]
       )
     }

packages/contractkit/src/governance/proxy.ts

@@ -1,5 +1,31 @@
 import { ABIDefinition } from 'web3-eth-abi'
 import { AbiItem } from 'web3-utils'
+import { ABI as AccountsABI } from '../generated/Accounts'
+import { ABI as AttestationsABI } from '../generated/Attestations'
+import { ABI as BlockchainParametersABI } from '../generated/BlockchainParameters'
+import { ABI as DoubleSigningSlasherABI } from '../generated/DoubleSigningSlasher'
+import { ABI as DowntimeSlasherABI } from '../generated/DowntimeSlasher'
+import { ABI as ElectionABI } from '../generated/Election'
+import { ABI as EpochRewardsABI } from '../generated/EpochRewards'
+import { ABI as EscrowABI } from '../generated/Escrow'
+import { ABI as ExchangeABI } from '../generated/Exchange'
+import { ABI as FeeCurrencyWhitelistABI } from '../generated/FeeCurrencyWhitelist'
+import { ABI as FreezerABI } from '../generated/Freezer'
+import { ABI as GasPriceMinimumABI } from '../generated/GasPriceMinimum'
+import { ABI as GoldTokenABI } from '../generated/GoldToken'
+import { ABI as GovernanceABI } from '../generated/Governance'
+import { ABI as LockedGoldABI } from '../generated/LockedGold'
+import { ABI as MetaTransactionWalletABI } from '../generated/MetaTransactionWallet'
+import { ABI as MetaTransactionWalletDeployerABI } from '../generated/MetaTransactionWalletDeployer'
+import { ABI as MultiSigABI } from '../generated/MultiSig'
+import { ABI as ProxyABI } from '../generated/Proxy'
+import { ABI as RandomABI } from '../generated/Random'
+import { ABI as RegistryABI } from '../generated/Registry'
+import { ABI as ReserveABI } from '../generated/Reserve'
+import { ABI as SortedOraclesABI } from '../generated/SortedOracles'
+import { ABI as StableTokenABI } from '../generated/StableToken'
+import { ABI as TransferWhitelistABI } from '../generated/TransferWhitelist'
+import { ABI as ValidatorsABI } from '../generated/Validators'
 
 export const GET_IMPLEMENTATION_ABI: ABIDefinition = {
   constant: true,
@@ -63,10 +89,41 @@ export const PROXY_SET_IMPLEMENTATION_SIGNATURE = SET_IMPLEMENTATION_ABI.signatu
 export const PROXY_SET_AND_INITIALIZE_IMPLEMENTATION_SIGNATURE =
   SET_AND_INITIALIZE_IMPLEMENTATION_ABI.signature
 
-export const getInitializeAbiOfImplementation = (proxyContractName: string) => {
-  const implementationABI = require(`../generated/${proxyContractName.replace('Proxy', '')}`)
-    .ABI as AbiItem[]
-  const initializeAbi = implementationABI.find((item) => item.name === 'initialize')
+const findInitializeAbi = (items: AbiItem[]) => items.find((item) => item.name === 'initialize')
+
+const initializeAbiMap = {
+  AccountsProxy: findInitializeAbi(AccountsABI),
+  AttestationsProxy: findInitializeAbi(AttestationsABI),
+  BlockchainParametersProxy: findInitializeAbi(BlockchainParametersABI),
+  DoubleSigningSlasherProxy: findInitializeAbi(DoubleSigningSlasherABI),
+  DowntimeSlasherProxy: findInitializeAbi(DowntimeSlasherABI),
+  ElectionProxy: findInitializeAbi(ElectionABI),
+  EpochRewardsProxy: findInitializeAbi(EpochRewardsABI),
+  EscrowProxy: findInitializeAbi(EscrowABI),
+  ExchangeProxy: findInitializeAbi(ExchangeABI),
+  FeeCurrencyWhitelistProxy: findInitializeAbi(FeeCurrencyWhitelistABI),
+  FreezerProxy: findInitializeAbi(FreezerABI),
+  GasPriceMinimumProxy: findInitializeAbi(GasPriceMinimumABI),
+  GoldTokenProxy: findInitializeAbi(GoldTokenABI),
+  GovernanceProxy: findInitializeAbi(GovernanceABI),
+  LockedGoldProxy: findInitializeAbi(LockedGoldABI),
+  MetaTransactionWalletProxy: findInitializeAbi(MetaTransactionWalletABI),
+  MetaTransactionWalletDeployerProxy: findInitializeAbi(MetaTransactionWalletDeployerABI),
+  MultiSigProxy: findInitializeAbi(MultiSigABI),
+  ProxyProxy: findInitializeAbi(ProxyABI),
+  RandomProxy: findInitializeAbi(RandomABI),
+  RegistryProxy: findInitializeAbi(RegistryABI),
+  ReserveProxy: findInitializeAbi(ReserveABI),
+  SortedOraclesProxy: findInitializeAbi(SortedOraclesABI),
+  StableTokenProxy: findInitializeAbi(StableTokenABI),
+  TransferWhitelistProxy: findInitializeAbi(TransferWhitelistABI),
+  ValidatorsProxy: findInitializeAbi(ValidatorsABI),
+}
+
+export const getInitializeAbiOfImplementation = (
+  proxyContractName: keyof typeof initializeAbiMap
+) => {
+  const initializeAbi = initializeAbiMap[proxyContractName]
   if (!initializeAbi) {
     throw new Error(`Initialize method not found on implementation of ${proxyContractName}`)
   }

packages/komencikit/src/kit.ts

@@ -364,7 +364,7 @@ export class KomenciKit {
     const accounts = await this.contractKit.contracts.getAccounts()
     return this.submitMetaTransaction(
       metaTxWalletAddress,
-      accounts.setAccount(name, dataEncryptionKey, walletAddress, proofOfPossession).txo
+      accounts.setAccount(name, dataEncryptionKey, walletAddress, proofOfPossession)
     )
   }
 

packages/komencikit/src/verifyWallet.ts

@@ -2,32 +2,26 @@ import { Address, normalizeAddress } from '@celo/base'
 import { Err, Ok, Result } from '@celo/base/lib/result'
 import { ContractKit } from '@celo/contractkit'
 import { GET_IMPLEMENTATION_ABI } from '@celo/contractkit/lib/governance/proxy'
-import Proxy from '@celo/protocol/build/contracts/Proxy.json'
-import {
-  InvalidBytecode,
-  InvalidImplementation,
-  InvalidSigner,
-  WalletValidationError,
-} from './errors'
+import { InvalidImplementation, InvalidSigner, WalletValidationError } from './errors'
 
 export const verifyWallet = async (
   contractKit: ContractKit,
-  walletAddress: Address,
+  metaTxWalletAddress: Address,
   allowedImplementations: Address[],
   expectedSigner: Address
 ): Promise<Result<true, WalletValidationError>> => {
-  const code = await contractKit.web3.eth.getCode(walletAddress)
+  // const code = await contractKit.web3.eth.getCode(metaTxWalletAddress)
   // XXX: I'm unsure whether this is safe or if we should store the
   // bytecode as a constant in `mobile` and pass it into KomenciKit
   // I'm unsure if we should protect from the `Proxy` contract output
   // in protocol from changing, or there are already constraints put in
   // place for that not to happen.
-  if (stripBzz(code) !== stripBzz(Proxy.deployedBytecode)) {
-    return Err(new InvalidBytecode(walletAddress))
-  }
+  // if (stripBzz(code) !== stripBzz(Proxy.deployedBytecode)) {
+  //   return Err(new InvalidBytecode(metaTxWalletAddress))
+  // }
 
   const actualImplementationRaw = await contractKit.web3.eth.call({
-    to: walletAddress,
+    to: metaTxWalletAddress,
     data: GET_IMPLEMENTATION_ABI.signature,
   })
   const actualImplementation = normalizeAddress(
@@ -42,25 +36,25 @@ export const verifyWallet = async (
   if (normalizedAllowedImplementations.indexOf(actualImplementation) === -1) {
     return Err(
       new InvalidImplementation(
-        walletAddress,
+        metaTxWalletAddress,
         actualImplementation,
         normalizedAllowedImplementations
       )
     )
   }
 
-  const wallet = await contractKit.contracts.getMetaTransactionWallet(walletAddress)
+  const wallet = await contractKit.contracts.getMetaTransactionWallet(metaTxWalletAddress)
   const actualSigner = normalizeAddress(await wallet.signer())
   const normalizedExpectedSigner = normalizeAddress(expectedSigner)
   if (actualSigner !== normalizedExpectedSigner) {
-    return Err(new InvalidSigner(walletAddress, actualSigner, normalizedExpectedSigner))
+    return Err(new InvalidSigner(metaTxWalletAddress, actualSigner, normalizedExpectedSigner))
   }
 
   return Ok(true)
 }
 
-function stripBzz(bytecode: string): string {
-  // The actual deployed bytecode always differs because of the BZZ prefix
-  // https://www.shawntabrizi.com/ethereum/verify-ethereum-contracts-using-web3-js-and-solc/
-  return bytecode.split('a265627a7a72315820')[0]
-}
+// function stripBzz(bytecode: string): string {
+//   // The actual deployed bytecode always differs because of the BZZ prefix
+//   // https://www.shawntabrizi.com/ethereum/verify-ethereum-contracts-using-web3-js-and-solc/
+//   return bytecode.split('a265627a7a72315820')[0]
+// }

packages/mobile/babel.config.js

@@ -1,3 +1,4 @@
 module.exports = {
+  plugins: [[require('@babel/plugin-proposal-decorators').default, { legacy: true }]],
   presets: ['module:metro-react-native-babel-preset'],
 }

packages/mobile/ios/Podfile.lock

@@ -756,7 +756,7 @@ SPEC CHECKSUMS:
   Analytics: fcf79ebc393a7d77befb8d43ce296353ba9ede3d
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   CeloBlockchain: 84bc1cf8faace08aeecdeb24a30f0492b4c266cf
-  DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
+  DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 4aab18c93cd9546e4bfed752b4084585eca8b245
   FBReactNativeSpec: 5465d51ccfeecb7faa12f9ae0024f2044ce4044e
   Firebase: 458d109512200d1aca2e1b9b6cf7d68a869a4a46
@@ -774,7 +774,7 @@ SPEC CHECKSUMS:
   FirebaseMessaging: 089b7a4991425783384acc8bcefcd78c0af913bd
   FirebaseStorage: 93fe2f8190a01bfb2b2c4932df7d679744c4ef1d
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
-  glog: 1f3da668190260b06b429bb211bfbee5cd790c28
+  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
   GoogleAppMeasurement: dfe55efa543e899d906309eaaac6ca26d249862f
   GoogleDataTransport: 061fe7d9b476710e3cd8ea51e8e07d8b67c2b420
   GoogleDataTransportCCTSupport: 0f39025e8cf51f168711bd3fb773938d7e62ddb5

packages/mobile/locales/en-US/global.json

@@ -44,6 +44,7 @@
   "invalidPhone": "Invalid phone number",
   "cantSelectInvalidPhone": "Cannot select contact: invalid phone number",
   "needMoreFundsToSend": "Need more funds to send payment",
+  "maxEscrowTransferExceeded": "The maximum amount to transfer to unverified users is {{symbol}}{{maxAmount}}",
   "invalidAmount": "Invalid amount",
   "invalidCode": "Invalid Verification Code",
   "confirm": "Confirm",

packages/mobile/locales/es-419/global.json

@@ -44,6 +44,7 @@
   "invalidPhone": "Número de teléfono inválido",
   "cantSelectInvalidPhone": "No se puede seleccionar el contacto: número de teléfono no válido",
   "needMoreFundsToSend": "Necesita más fondos para enviar el pago",
+  "maxEscrowTransferExceeded": "La cantidad máxima a transferir a usuarios no verificados es de {{symbol}}{{maxAmount}}",
   "invalidAmount": "Monto invalido",
   "invalidCode": "Código de verificación inválido",
   "confirm": "Confirmar",

packages/mobile/metro.config.js

@@ -8,7 +8,7 @@ const cwd = path.resolve(__dirname)
 const root = path.resolve(cwd, '../..')
 const escapedRoot = escapeStringRegexp(root)
 const celoRegex = new RegExp(
-  `${escapedRoot}\/packages\/(?!mobile|utils|base|contractkit|react-components).*`
+  `${escapedRoot}\/packages\/(?!mobile|utils|base|contractkit|komencikit|react-components).*`
 )
 const nestedRnRegex = new RegExp(`.*\/node_modules\/.*\/node_modules\/(react-native)\/.*`)
 const componentsRnRegex = new RegExp(`.*react-components\/node_modules\/(react-native)\/.*`)

packages/mobile/package.json

@@ -41,6 +41,7 @@
   "dependencies": {
     "@celo/client": "0.0.317",
     "@celo/contractkit": "0.4.19-dev",
+    "@celo/komencikit": "0.0.1-dev",
     "@celo/react-components": "1.0.0",
     "@celo/react-native-sms-retriever": "git+https://github.com/celo-org/react-native-sms-retriever#b88e502",
     "@celo/utils": "0.1.23-dev",
@@ -151,6 +152,7 @@
   },
   "devDependencies": {
     "@apollo/react-testing": "^3.1.3",
+    "@babel/plugin-proposal-decorators":"^7.12.1",
     "@celo/flake-tracker": "0.0.1-dev",
     "@celo/typescript": "0.0.1",
     "@graphql-codegen/add": "^1.10.0",

packages/mobile/src/account/__snapshots__/Settings.test.tsx.snap

@@ -4467,6 +4467,84 @@ exports[`Account renders correctly when verification is not possible 1`] = `
             </View>
           </View>
         </View>
+        <View
+          style={
+            Object {
+              "backgroundColor": "#FFFFFF",
+            }
+          }
+        >
+          <View
+            accessible={true}
+            focusable={true}
+            nativeBackgroundAndroid={
+              Object {
+                "attribute": "selectableItemBackgroundBorderless",
+                "type": "ThemeAttrAndroid",
+              }
+            }
+            onClick={[Function]}
+            onResponderGrant={[Function]}
+            onResponderMove={[Function]}
+            onResponderRelease={[Function]}
+            onResponderTerminate={[Function]}
+            onResponderTerminationRequest={[Function]}
+            onStartShouldSetResponder={[Function]}
+          >
+            <View
+              style={
+                Object {
+                  "borderBottomColor": "#EDEEEF",
+                  "borderBottomWidth": 1,
+                  "marginLeft": 16,
+                  "paddingVertical": 16,
+                }
+              }
+            >
+              <View
+                style={
+                  Object {
+                    "alignItems": "center",
+                    "flexDirection": "row",
+                    "justifyContent": "space-between",
+                    "paddingRight": 16,
+                  }
+                }
+              >
+                <View
+                  style={
+                    Array [
+                      Object {
+                        "justifyContent": "center",
+                      },
+                    ]
+                  }
+                >
+                  <Text
+                    style={
+                      Object {
+                        "color": "#2E3338",
+                        "fontFamily": "Inter-Regular",
+                        "fontSize": 16,
+                        "lineHeight": 22,
+                      }
+                    }
+                  >
+                    confirmNumber
+                  </Text>
+                </View>
+                <View
+                  style={
+                    Object {
+                      "alignItems": "center",
+                      "flexDirection": "row",
+                    }
+                  }
+                />
+              </View>
+            </View>
+          </View>
+        </View>
         <View
           style={
             Object {

packages/mobile/src/account/actions.ts

@@ -12,6 +12,9 @@ export enum Actions {
   SET_PINCODE_SUCCESS = 'ACCOUNT/SET_PINCODE_SUCCESS',
   SET_PINCODE_FAILURE = 'ACCOUNT/SET_PINCODE_FAILURE',
   SET_ACCOUNT_CREATION_TIME = 'ACCOUNT/SET_ACCOUNT_CREATION_TIME',
+  INITIALIZE_ACCOUNT = 'ACCOUNT/INITIALIZE_ACCOUNT',
+  INITIALIZE_ACCOUNT_SUCCESS = 'ACCOUNT/INITIALIZE_ACCOUNT_SUCCESS',
+  INITIALIZE_ACCOUNT_FAILURE = 'ACCOUNT/INITIALIZE_ACCOUNT_FAILURE',
   SET_BACKUP_COMPLETED = 'ACCOUNT/SET_BACKUP_COMPLETED',
   SET_BACKUP_DELAYED = 'ACCOUNT/SET_BACKUP_DELAYED',
   TOGGLE_BACKUP_STATE = 'ACCOUNT/TOGGLE_BACKUP_STATE',
@@ -73,6 +76,18 @@ export interface SetPincodeFailureAction {
   type: Actions.SET_PINCODE_FAILURE
 }
 
+export interface InitializeAccountAction {
+  type: Actions.INITIALIZE_ACCOUNT
+}
+
+export interface InitializeAccountSuccessAction {
+  type: Actions.INITIALIZE_ACCOUNT_SUCCESS
+}
+
+export interface InitializeAccountFailureAction {
+  type: Actions.INITIALIZE_ACCOUNT_FAILURE
+}
+
 export interface SetAccountCreationAction {
   type: Actions.SET_ACCOUNT_CREATION_TIME
 }
@@ -133,6 +148,9 @@ export type ActionTypes =
   | SetPincodeAction
   | SetPincodeSuccessAction
   | SetPincodeFailureAction
+  | InitializeAccountAction
+  | InitializeAccountSuccessAction
+  | InitializeAccountFailureAction
   | SetAccountCreationAction
   | SetBackupCompletedAction
   | SetBackupDelayedAction
@@ -206,6 +224,18 @@ export const setPincodeFailure = (): SetPincodeFailureAction => ({
   type: Actions.SET_PINCODE_FAILURE,
 })
 
+export const initializeAccount = (): InitializeAccountAction => ({
+  type: Actions.INITIALIZE_ACCOUNT,
+})
+
+export const initializeAccountSuccess = (): InitializeAccountSuccessAction => ({
+  type: Actions.INITIALIZE_ACCOUNT_SUCCESS,
+})
+
+export const initializeAccountFailure = (): InitializeAccountFailureAction => ({
+  type: Actions.INITIALIZE_ACCOUNT_FAILURE,
+})
+
 export const setAccountCreationTime = (): SetAccountCreationAction => ({
   type: Actions.SET_ACCOUNT_CREATION_TIME,
 })